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

[Rex Dieter]

commit 4d55a18f015f13995d8140109a84fb8f9529ee48
Merge: fa3a3ba 2a6f31a
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sat Nov 8 20:21:16 2014 -0600

    Merge branch 'master' into f20

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