[kig/f20: 12/12] Merge branch 'master' into f20

[Rex Dieter]

commit 3de68c11dbd90206d73feb6620c37230d30f4d2e
Merge: 8a65635 2bd33b5
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jun 30 23:00:46 2014 -0500

    Merge branch 'master' into f20

 .gitignore |    6 ++++++
 kig.spec   |   31 ++++++++++++++++++++++++++++++-
 sources    |    2 +-
 3 files changed, 37 insertions(+), 2 deletions(-)
---