[khangman/f18: 7/7] Merge branch 'master' into f18

[Rex Dieter]

commit 3b025905b824b2d2d39d0ba1611bb945b4303afb
Merge: 6592d5c 6dacb61
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Mar 4 10:53:19 2013 -0600

    Merge branch 'master' into f18
    
    Conflicts:
    	.gitignore
    	khangman.spec
    	sources

 .gitignore    |    7 +------
 khangman.spec |   21 ++++++++++++++++++---
 sources       |    2 +-
 3 files changed, 20 insertions(+), 10 deletions(-)
---