commit a0a199011c681b0c99ca25f68e633d484229c4d1 Merge: 57ac922 d941555 Author: Rex Dieter <rdieter at math.unl.edu> Date: Thu Sep 5 13:30:39 2013 -0500 Merge branch 'master' into f19 .gitignore | 5 +++++ kiriki.spec | 17 ++++++++++++++++- sources | 2 +- 3 files changed, 22 insertions(+), 2 deletions(-) ---