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

[Rex Dieter]

commit 1a1cb56314144f5122cc255067ad3b5287e1ef67
Merge: 68ef07d d61e7c9
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Jul 15 12:49:32 2014 -0500

    Merge branch 'master' into f20

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