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

[Rex Dieter]

commit 098d1f0902e5298f11680992cada359057ef5f2c
Merge: ee7f46e f11d118
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Feb 3 11:19:02 2014 -0600

    Merge branch 'master' into f20

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