commit 147753742ad530353f8068bd673e582e258b36e5 Merge: b43ca05 8b883ec Author: Rex Dieter <rdieter at fedoraproject.org> Date: Sat Sep 29 17:07:31 2012 -0500 Merge branch 'f18' into f17 .gitignore | 1 + kwordquiz.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) ---