commit 9a88620e848a6254724d86c5b02130bbe820c503 Merge: 6d8b2bc d3a785d Author: Rex Dieter <rdieter at fedoraproject.org> Date: Sat Sep 29 17:02:43 2012 -0500 Merge branch 'f18' into f17 .gitignore | 1 + khangman.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) ---