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

[Rex Dieter]

commit 3db0dc5f46e9fbe6f0e1559d5208de6a2280a9be
Merge: c299b5a 575d1c3
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jan 19 20:23:56 2015 -0600

    Merge branch 'master' into f20

 .gitignore  |    1 +
 kgamma.spec |    9 ++++++---
 sources     |    2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)
---