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

[Rex Dieter]

commit ee74c95b08990ec0bf4ab1eb4e769aec7f89d9d7
Merge: ed6121e cd9895a
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sat Nov 8 20:04:46 2014 -0600

    Merge branch 'master' into f20

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