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

[Rex Dieter]

commit 05a8cf1bb5548ba3b170c53b30e6c5744ccdf39f
Merge: b9e5131 3fe2818
Author: Rex Dieter <rdieter at gmail.com>
Date:   Sun Mar 1 17:17:40 2015 -0600

    Merge branch 'master' into f20

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