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

[Rex Dieter]

commit 83cc53eda86ed5a7a999deab5f6fb005a4eb9588
Merge: 8e89001 74db668
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Feb 3 08:48:02 2014 -0600

    Merge branch 'master' into f20

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