[ksquares/f20: 5/5] Merge branch 'master' into f20

[Rex Dieter]

commit f5d871d9c340d469893e7fe22e4cf81d7c04827e
Merge: 89be4f8 846cb1d
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Sep 16 20:33:09 2014 -0500

    Merge branch 'master' into f20

 .gitignore    |    3 +++
 ksquares.spec |   14 +++++++++++++-
 sources       |    2 +-
 3 files changed, 17 insertions(+), 2 deletions(-)
---