[kwordquiz/f17: 2/2] Merge branch 'f18' into f17

[Rex Dieter]

commit a1ce7a95d014217b4f448fef6d2830e18be556e1
Merge: 440d693 3573c90
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sat Dec 29 07:55:40 2012 -0600

    Merge branch 'f18' into f17

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