commit 51bf838a5b066faf15cc6379f36ecef43313263b
Merge: 5e176f1 de7d890
Author: Rex Dieter <rdieter at math.unl.edu>
Date: Mon Jun 30 22:41:49 2014 -0500
Merge branch 'master' into f20
.gitignore | 6 ++++++
kapptemplate.spec | 23 ++++++++++++++++++++++-
sources | 2 +-
3 files changed, 29 insertions(+), 2 deletions(-)
---