commit 2c942105907f7509e1d5899680e3a7257c0201d5 Merge: ee608ee c445602 Author: Rex Dieter <rdieter at math.unl.edu> Date: Thu Sep 5 13:07:32 2013 -0500 Merge branch 'master' into f19 .gitignore | 5 +++++ kajongg.spec | 17 ++++++++++++++++- sources | 2 +- 3 files changed, 22 insertions(+), 2 deletions(-) ---