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

[Rex Dieter]

commit 9217c31707c89ae0e225b0005f8d086d3f2453ef
Merge: 206da95 49c1cbb
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jun 30 22:58:34 2014 -0500

    Merge branch 'master' into f20

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