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

[Rex Dieter]

commit ac343082708fe42c5be092455ec1e86f994edfbe
Merge: 0d59ddb 3169443
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Wed Aug 6 14:10:56 2014 -0500

    Merge branch 'master' into f21

 .gitignore       |    1 +
 kde-runtime.spec |   66 +++++++++++++++++++++++++++++++++++++++++------------
 sources          |    2 +-
 3 files changed, 53 insertions(+), 16 deletions(-)
---