[kscd/f20: 3/3] Merge branch 'master' into f20

[Rex Dieter]

commit 465b31bf89f3bd43fc5bff696670f3d1aef940c4
Merge: bc7aae6 6d2f802
Author: Rex Dieter <rdieter at gmail.com>
Date:   Sun Mar 1 17:20:26 2015 -0600

    Merge branch 'master' into f20

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