commit cce53403b912493c049a4341773058a1c7a02b3d Merge: 51bf838 232030e Author: Rex Dieter <rdieter at math.unl.edu> Date: Tue Jul 15 12:24:04 2014 -0500 Merge branch 'master' into f20 .gitignore | 1 + kapptemplate.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) ---