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

[Rex Dieter]

commit 2969e36cf9693868bfed3ae84a48873768309d2b
Merge: bd70a16 e473db7
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jun 30 23:03:19 2014 -0500

    Merge branch 'master' into f20

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