[knavalbattle/f19: 7/7] Merge branch 'master' into f19

[Rex Dieter]

commit 5f684e2597f8be011ce081f76a5816950f9f7523
Merge: b145156 edada17
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Thu Sep 5 13:36:26 2013 -0500

    Merge branch 'master' into f19

 .gitignore        |    5 +++++
 knavalbattle.spec |   17 ++++++++++++++++-
 sources           |    2 +-
 3 files changed, 22 insertions(+), 2 deletions(-)
---