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

[Rex Dieter]

commit 670e4a45a81272fc60381718514df4989261cc6e
Merge: b734e8a 9baad4c
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sat Oct 11 08:25:53 2014 -0500

    Merge branch 'master' into f20

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