commit 5d2eed2086f178a5fe20b50da1e1995253c3f30d Merge: 9707980 d03b640 Author: Rex Dieter <rdieter at math.unl.edu> Date: Thu Sep 5 06:44:27 2013 -0500 Merge branch 'master' into f19 .gitignore | 5 +++++ libkmahjongg.spec | 17 ++++++++++++++++- sources | 2 +- 3 files changed, 22 insertions(+), 2 deletions(-) ---