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

[Than Ngo]

commit a6c5c043b9ef937b5aaddf74721873ef1107a7b7
Merge: 2ecae92 05a1ba0
Author: Than Ngo <than at redhat.com>
Date:   Thu Dec 6 15:36:34 2012 +0100

    Merge branch 'f18' into f17

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