commit b1a7418266faa75ebd0e9192836d8563d351751c Merge: 91a775f 168fef0 Author: Rex Dieter <rdieter at math.unl.edu> Date: Tue Jul 15 12:45:16 2014 -0500 Merge branch 'master' into f20 .gitignore | 1 + ksirk.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) ---