[khangman/f20: 10/10] Merge branch 'master' into f20

[Rex Dieter]

commit cf983c2bc0d72105e1dfe351f009845e87bb2e31
Merge: 6eceb10 3b660b9
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jun 30 23:00:24 2014 -0500

    Merge branch 'master' into f20

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