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

[Rex Dieter]

commit 729cbbe65c69abf9710aa0ac2696224ce1e9c1f7
Merge: ee74c95 68030c8
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jan 19 19:39:15 2015 -0600

    Merge branch 'master' into f20

 .gitignore            |    1 +
 kdesdk-kioslaves.spec |    9 ++++++---
 sources               |    2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)
---