[kwordquiz/f19: 7/7] Merge branch 'master' into f19

[Rex Dieter]

commit dcf606d63f878f013c7c5ebafe934eaf45c7db70
Merge: 0b1c154 5c4cbe2
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Thu Sep 5 13:49:41 2013 -0500

    Merge branch 'master' into f19

 .gitignore     |    5 +++++
 kwordquiz.spec |   17 ++++++++++++++++-
 sources        |    2 +-
 3 files changed, 22 insertions(+), 2 deletions(-)
---