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

[Rex Dieter]

commit 738d1955d150e0e2f39269b4004fd8111ce315e1
Merge: 0ed78a3 3467893
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jun 30 23:06:49 2014 -0500

    Merge branch 'master' into f20

 .gitignore        |    6 ++++++
 knavalbattle.spec |   23 ++++++++++++++++++++++-
 sources           |    2 +-
 3 files changed, 29 insertions(+), 2 deletions(-)
---