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

[Rex Dieter]

commit 2aad74f7c26880587483119be761c9384a0b613a
Merge: 8e2d04e ce1c1a9
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Jul 15 12:32:12 2014 -0500

    Merge branch 'master' into f20

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