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

[Rex Dieter]

commit a5ffb0d9ffde212b9e6df4577fbd5ab513032a04
Merge: e44a29a ce52a24
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Aug 3 07:31:40 2012 -0500

    Merge branch 'f17' into f16

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