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

[Rex Dieter]

commit 5422101a0d5366884e0ee159a5aab8ba4b8c806a
Merge: a6c5c04 6592d5c
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sat Dec 29 07:49:13 2012 -0600

    Merge branch 'f18' into f17

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