[kigo/f20: 5/5] Merge branch 'master' into f20

[Rex Dieter]

commit 6388fe71a717f9d76a54a81f5a0780d737859fcb
Merge: 688163d 26f3652
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Sep 16 20:20:21 2014 -0500

    Merge branch 'master' into f20

 .gitignore |    3 +++
 kigo.spec  |   14 +++++++++++++-
 sources    |    2 +-
 3 files changed, 17 insertions(+), 2 deletions(-)
---