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

[Rex Dieter]

commit cc714a1c811ece3ce58be7b00f5bb09ffda40ce8
Merge: ddc7449 cbc94e4
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jun 30 22:39:38 2014 -0500

    Merge branch 'master' into f20

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