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

[Rex Dieter]

commit 9048770b51fa08e8bb414ab06034ecd83ac03c87
Merge: 47aaf1f b2450a6
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sat Nov 8 07:51:10 2014 -0600

    Merge branch 'master' into f21

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