[kapptemplate/f20: 5/5] Merge branch 'master' into f20

Wed Sep 17 01:03:53 UTC 2014

commit 58fd4cd2b3df6976705bca663d610fdb1e525a87
Merge: cce5340 f0b5f12
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Sep 16 20:03:48 2014 -0500

    Merge branch 'master' into f20

 .gitignore        |    3 +++
 kapptemplate.spec |   14 +++++++++++++-
 sources           |    2 +-
 3 files changed, 17 insertions(+), 2 deletions(-)
---