[kajongg/f20: 5/5] Merge branch 'master' into f20

[Rex Dieter]

commit 66a455af855d268c2ba0c11311e4433d48d317d2
Merge: 72fb20c bbf2757
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Sep 16 20:01:50 2014 -0500

    Merge branch 'master' into f20

 .gitignore   |    3 +++
 kajongg.spec |   18 +++++++++++++++---
 sources      |    2 +-
 3 files changed, 19 insertions(+), 4 deletions(-)
---