[kshisen/f20: 10/10] Merge branch 'master' into f20

[Rex Dieter]

commit 0f529bdab1b3c152754bbbc05b27f41be3f7f560
Merge: a65ac3f 2310056
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jun 30 23:13:26 2014 -0500

    Merge branch 'master' into f20

 .gitignore   |    6 ++++++
 kshisen.spec |   23 ++++++++++++++++++++++-
 sources      |    2 +-
 3 files changed, 29 insertions(+), 2 deletions(-)
---