[konquest/f20: 5/5] Merge branch 'master' into f20

[Rex Dieter]

commit d58eabb0fdf64b748cef9868deae55b200ebda3c
Merge: 5b37f69 c56fe64
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Sep 16 20:27:15 2014 -0500

    Merge branch 'master' into f20

 .gitignore    |    3 +++
 konquest.spec |   14 +++++++++++++-
 sources       |    2 +-
 3 files changed, 17 insertions(+), 2 deletions(-)
---