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

[Rex Dieter]

commit 3ab0e3f766cc47cf95407fe489c6e36ea2044cda
Merge: d0d59ae ff24482
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Jul 15 12:44:20 2014 -0500

    Merge branch 'master' into f20

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