[kdemultimedia/f20: 2/2] Merge branch 'master' into f20

[Rex Dieter]

commit 1ff392b834e2f1441a6a738702037e201771991e
Merge: 3c471fe c96b770
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sat Nov 8 20:02:13 2014 -0600

    Merge branch 'master' into f20

 kdemultimedia.spec |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---