[kgpg/f20: 11/11] Merge branch 'master' into f20

[Rex Dieter]

commit c72095c6d4d4e9b25b5ddfbc4002efbfa9283a7f
Merge: 7f41bf5 3097f46
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jun 30 23:00:02 2014 -0500

    Merge branch 'master' into f20

 .gitignore |    6 ++++++
 kgpg.spec  |   24 +++++++++++++++++++++++-
 sources    |    2 +-
 3 files changed, 30 insertions(+), 2 deletions(-)
---