[konquest/f19: 7/7] Merge branch 'master' into f19

[Rex Dieter]

commit c7b1eac2552139d404a436de60c7d3452143a158
Merge: 1ffa8da af3c325
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Thu Sep 5 13:38:47 2013 -0500

    Merge branch 'master' into f19

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