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

[Rex Dieter]

commit 7e476e03149a2f96d4575ac3c619d8276d89d254
Merge: cbfe31e 7caacc6
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Jul 15 12:45:30 2014 -0500

    Merge branch 'master' into f20

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