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

[Rex Dieter]

commit c0055ee04e6b76d13b04be6519e0264ccdc4c06a
Merge: 497480d 16ba151
Author: Rex Dieter <rdieter at gmail.com>
Date:   Sun Mar 1 17:09:26 2015 -0600

    Merge branch 'master' into f20

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