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

[Rex Dieter]

commit 89be4f87368eec957c9c645b1f30cfaf5300e30d
Merge: b235afd 0bb71e7
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Jul 15 12:46:12 2014 -0500

    Merge branch 'master' into f20

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