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

[Rex Dieter]

commit fd85b92363e0d3c80f560ba132519693bcbdeacc
Merge: 8332d9f be1fe39
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Jul 1 09:11:20 2014 -0500

    Merge branch 'master' into f20

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