commit 239d363bca5731d54ad9a3752cf226360b65d431 Merge: a3fc565 21df86f Author: Rex Dieter <rdieter at math.unl.edu> Date: Thu Sep 5 13:43:08 2013 -0500 Merge branch 'master' into f19 .gitignore | 5 +++++ kshisen.spec | 17 ++++++++++++++++- sources | 2 +- 3 files changed, 22 insertions(+), 2 deletions(-) ---