[kde-runtime/f21: 3/3] Merge branch 'master' into f21

[Rex Dieter]

commit 2a340a36e5937d7297c831b3ee851c01003bc8c3
Merge: bc7173d 3ea298a
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sat Mar 7 08:52:12 2015 -0600

    Merge branch 'master' into f21

 kde-runtime.spec | 52 ++++++++++++++++++++++++++--------------------------
 1 file changed, 26 insertions(+), 26 deletions(-)
---