[knavalbattle/f20: 3/3] Merge branch 'master' into f20

[Rex Dieter]

commit b9e5131baf6b806552ab032ba710f9a5bcac3594
Merge: d6e654e b720d7e
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Jan 20 09:23:03 2015 -0600

    Merge branch 'master' into f20

 .gitignore        |    2 ++
 knavalbattle.spec |   12 +++++++++---
 sources           |    2 +-
 3 files changed, 12 insertions(+), 4 deletions(-)
---