commit a107474b4cf01184945ffc3ee60c3a380712d40d Merge: 2029789 02e2434 Author: Rex Dieter <rdieter at math.unl.edu> Date: Mon Jun 30 23:07:32 2014 -0500 Merge branch 'master' into f20 .gitignore | 6 ++++++ kolf.spec | 23 ++++++++++++++++++++++- sources | 2 +- 3 files changed, 29 insertions(+), 2 deletions(-) ---