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

[Rex Dieter]

commit 3ef24d7cf0f530d947ed7c2fd3dfd08b2d6f467d
Merge: 3038079 036f69a
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Feb 3 10:32:01 2014 -0600

    Merge branch 'master' into f20

 .gitignore        |    6 ++++++
 knavalbattle.spec |   35 +++++++++++++++++++++++++++--------
 sources           |    2 +-
 3 files changed, 34 insertions(+), 9 deletions(-)
---