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

[Rex Dieter]

commit 5b37f69b87c93df8031dbb280e62e3f46e207682
Merge: 0f6c860 078d772
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Jul 15 12:41:58 2014 -0500

    Merge branch 'master' into f20

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