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

[Rex Dieter]

commit a10e16db0bde85c2305d50757be58d3fcd35b17d
Merge: e8a5930 0a248e3
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Sep 16 20:31:05 2014 -0500

    Merge branch 'master' into f20

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