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

[Rex Dieter]

commit d8ac5793e0707de58a2d7c786d0050fd3dd287d1
Merge: 3de68c1 a5d9523
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Jul 15 12:36:30 2014 -0500

    Merge branch 'master' into f20

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