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

[Rex Dieter]

commit e8a5930fec91ca14911863d66acdc244b1028817
Merge: fd85b92 65b8d0b
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Jul 15 12:44:48 2014 -0500

    Merge branch 'master' into f20

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