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

[Rex Dieter]

commit d6e654e16e7647f2e81d2b6e04c3d09b28ac16f3
Merge: e010f80 2e2b4cc
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sat Nov 8 20:14:29 2014 -0600

    Merge branch 'master' into f20

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