[kmahjongg/f19: 7/7] Merge branch 'master' into f19

[Rex Dieter]

commit e1791a8a2277a1c338c79eccb157c4e565eb9df6
Merge: 6c82035 76066ef
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Thu Sep 5 13:33:52 2013 -0500

    Merge branch 'master' into f19

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