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

[Rex Dieter]

commit 8c389e13c239866687fa3beb636d01fe5296062c
Merge: 729cbbe ddc2e37
Author: Rex Dieter <rdieter at gmail.com>
Date:   Sun Mar 1 17:13:04 2015 -0600

    Merge branch 'master' into f20

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