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

[Rex Dieter]

commit be148f6dff993c96a49205808556eb0bd4e63f9e
Merge: 9ac8e6d 3176994
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Jan 20 09:36:33 2015 -0600

    Merge branch 'master' into f20

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