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

[Rex Dieter]

commit 497480d5863e33731bd34986d538b177c69b597e
Merge: 3ece47c 9b1614e
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jan 19 15:45:25 2015 -0600

    Merge branch 'master' into f20

 .gitignore   |   31 +------------------------------
 kajongg.spec |   19 ++++++++++++-------
 sources      |    2 +-
 3 files changed, 14 insertions(+), 38 deletions(-)
---