[kdesdk-kioslaves/f20: 10/10] Merge branch 'master' into f20

[Rex Dieter]

commit 8e2d04ecd99cb15d85d9bb7556d54f241e4b3d54
Merge: 642c962 7eb4fd0
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jun 30 22:54:13 2014 -0500

    Merge branch 'master' into f20

 .gitignore            |    6 ++++++
 kdesdk-kioslaves.spec |   23 ++++++++++++++++++++++-
 sources               |    2 +-
 3 files changed, 29 insertions(+), 2 deletions(-)
---