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

[Rex Dieter]

commit 508265062187095598c5b91f3f67766ba51cf721
Merge: 2969e36 f0498a7
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Jul 15 12:38:12 2014 -0500

    Merge branch 'master' into f20

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