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

[Rex Dieter]

commit ca84b109999f8bd3ee92cb9fb8f3230f8962b1e9
Merge: eb03d74 718cdb5
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sat Nov 8 16:45:21 2014 -0600

    Merge branch 'master' into f20

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