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

[Rex Dieter]

commit cddb54334e44ade6e9cf216d35518ffa54fea06a
Merge: dcda3ad e1ec168
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Jul 15 12:29:59 2014 -0500

    Merge branch 'master' into f20

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