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

[Rex Dieter]

commit 57ed77c8e055fe38a71d59fc296916c1982478d3
Merge: d7834c6 c3a25fb
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Feb 3 09:13:15 2014 -0600

    Merge branch 'master' into f20

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