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

[Rex Dieter]

commit aa2f3a892510e70fe3ce9986b7b4ba491d031be6
Merge: 665037f 5ee27f8
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sat Nov 8 20:22:50 2014 -0600

    Merge branch 'master' into f20

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