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

[Rex Dieter]

commit dcda3ad120c4670de96dab834bb76338a8e5d746
Merge: 0c4c984 3ccf164
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jun 30 22:51:05 2014 -0500

    Merge branch 'master' into f20

 kdemultimedia.spec |   23 ++++++++++++++++++++++-
 1 files changed, 22 insertions(+), 1 deletions(-)
---