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

[Rex Dieter]

commit eedf6cd88f276aacdcf1801a799fbf99a3883652
Merge: 631a4c3 a72602c
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jun 30 23:02:55 2014 -0500

    Merge branch 'master' into f20

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