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

[Rex Dieter]

commit 20bd84ea1c84a5c66a399694093fa28476fd3280
Merge: ce71550 e3d55d3
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jul 14 22:54:58 2014 -0500

    Merge branch 'master' into f20

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