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

[Rex Dieter]

commit d74cef9d964ef3e89e8a0a1a93fe8420cdfcfc01
Merge: 1477537 57707da
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Tue Nov 6 20:44:00 2012 -0600

    Merge branch 'f18' into f17

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