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

[Rex Dieter]

commit a89579d09004d2ac14d3b31eb1a25367af9bcc09
Merge: aa2f3a8 947d32f
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Jan 20 10:41:19 2015 -0600

    Merge branch 'master' into f20

 .gitignore   |    2 ++
 ksudoku.spec |   12 +++++++++---
 sources      |    2 +-
 3 files changed, 12 insertions(+), 4 deletions(-)
---