commit 44d390f2138c6c4f891cb42788e39c7f2f195118 Merge: 0f529bd 730cb71 Author: Rex Dieter <rdieter at math.unl.edu> Date: Tue Jul 15 12:45:02 2014 -0500 Merge branch 'master' into f20 .gitignore | 1 + kshisen.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) ---