commit 26e4f779d670e07a4620c42ff910e1e61122c376 Merge: 9dac657 01564e2 Author: Rex Dieter <rdieter at math.unl.edu> Date: Thu Sep 5 13:30:12 2013 -0500 Merge branch 'master' into f19 .gitignore | 5 +++++ kimono.spec | 17 ++++++++++++++++- sources | 2 +- 3 files changed, 22 insertions(+), 2 deletions(-) ---