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

[Rex Dieter]

commit b235afd27a22aabb0355c1b6d69a5cb682cd0716
Merge: a565d9e b6bbf8c
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jun 30 23:15:21 2014 -0500

    Merge branch 'master' into f20

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