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

[Rex Dieter]

commit 02de0420e730637330b498cb95099fe54ced847b
Merge: eedf6cd 18eaa2f
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Jul 15 12:37:58 2014 -0500

    Merge branch 'master' into f20

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