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

[Than Ngo]

commit 440d693a856fbc8335ecbcd3318f17744328a36d
Merge: d74cef9 cd264d4
Author: Than Ngo <than at redhat.com>
Date:   Thu Dec 6 15:43:00 2012 +0100

    Merge branch 'f18' into f17

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