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

[Rex Dieter]

commit 142a9d554812740cf834caf9a7a27734f29fd595
Merge: 4c471db d7dd208
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Feb 3 08:37:45 2014 -0600

    Merge branch 'master' into f20

 kdemultimedia.spec |   20 +++++++++++++++++++-
 1 files changed, 19 insertions(+), 1 deletions(-)
---