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

[Rex Dieter]

commit 240ef26e8017f33c953238bccc9996d706ff2dcc
Merge: d9926f4 b903bcf
Author: Rex Dieter <rdieter at gmail.com>
Date:   Sun Mar 1 12:29:17 2015 -0600

    Merge branch 'master' into f20

 .gitignore        | 2 ++
 libkmahjongg.spec | 8 +++++++-
 sources           | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)
---