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

[Rex Dieter]

commit c4bf4e93312b933e54faa396e36b02fba87fcb92
Merge: 4e6b9ce 8e5e57a
Author: Rex Dieter <rdieter at gmail.com>
Date:   Sun Mar 1 17:21:27 2015 -0600

    Merge branch 'master' into f20

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