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

[Rex Dieter]

commit bed36787da34af9168447664d7c388096af59b19
Merge: 77343c8 c67a1e5
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jun 30 23:01:09 2014 -0500

    Merge branch 'master' into f20

 .gitignore |    6 ++++++
 kigo.spec  |   23 ++++++++++++++++++++++-
 sources    |    2 +-
 3 files changed, 29 insertions(+), 2 deletions(-)
---