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

[Rex Dieter]

commit 6f18aa39d9de9e8d3b68c3b6ce8064ad3dae94b3
Merge: 1a1cb56 bbc487d
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Sep 16 20:37:57 2014 -0500

    Merge branch 'master' into f20

 .gitignore     |   28 +++-------------------------
 kwordquiz.spec |   21 ++++++++++++++++++++-
 sources        |    2 +-
 3 files changed, 24 insertions(+), 27 deletions(-)
---