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

[Rex Dieter]

commit 2b770071f4d6756cb87736271cdc1d0c300f9963
Merge: 3573c90 6e405b4
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Mar 4 09:54:38 2013 -0600

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

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