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

[Rex Dieter]

commit 612ec325ab0796c4d9136ac9996c09cea2587613
Merge: a487dff 6f9a35a
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sat Nov 8 20:09:08 2014 -0600

    Merge branch 'master' into f20

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