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

[Rex Dieter]

commit d0d59ae8e858c91adf130dab871ec5138d090727
Merge: 5fd84ac b8b4c79
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jun 30 23:12:33 2014 -0500

    Merge branch 'master' into f20

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