[kgamma/f20: 2/2] Merge branch 'master' into f20

[Rex Dieter]

commit e793fd18d0aefd2e5ee8b2837db7d9bd21ee1463
Merge: 9217c31 b171583
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Jul 15 12:34:55 2014 -0500

    Merge branch 'master' into f20

 .gitignore  |    1 +
 kgamma.spec |    5 ++++-
 sources     |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
---