commit ed16c282358e53c1ff4eb4fc6762227aaa2468b9 Merge: c8bbab5 c174f44 Author: Rex Dieter <rdieter at math.unl.edu> Date: Mon Jun 30 23:04:31 2014 -0500 Merge branch 'master' into f20 .gitignore | 6 ++++++ kmahjongg.spec | 23 ++++++++++++++++++++++- sources | 2 +- 3 files changed, 29 insertions(+), 2 deletions(-) ---