[kmahjongg/f20: 2/2] Merge branch 'master' into f20

[Rex Dieter]

commit 8e4ba76064615db08a2e6bde48d9fb97df784386
Merge: ed16c28 8945fae
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Jul 15 12:38:57 2014 -0500

    Merge branch 'master' into f20

 .gitignore     |    1 +
 kmahjongg.spec |    5 ++++-
 sources        |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
---