[kdelibs/f21: 3/3] Merge branch 'master' into f21

[Rex Dieter]

commit b734e8a845f159d14f9a4be212d24cb73b2f19b6
Merge: 4489cb1 015ad65
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Sep 15 09:18:51 2014 -0500

    Merge branch 'master' into f21

 .gitignore   |    1 +
 kdelibs.spec |    7 +++++--
 sources      |    2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)
---