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

[Rex Dieter]

commit 3ece47cc64b71cb4868283386d08ebdb76ed112f
Merge: c4c92b5 d518ba6
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sat Nov 8 19:53:05 2014 -0600

    Merge branch 'master' into f20

 .gitignore   |    1 +
 kajongg.spec |    5 ++++-
 sources      |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
---