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

[Rex Dieter]

commit 8fa977e5386c45dd9061561ee726bc2d1ab1bf41
Merge: 7e476e0 a81dc1c
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Sep 16 20:32:11 2014 -0500

    Merge branch 'master' into f20

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