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

[Rex Dieter]

commit 9ac8e6df71c183185b2b3f1f875bb0fb16f8f3a4
Merge: eccc339 3d323e5
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sat Nov 8 20:16:19 2014 -0600

    Merge branch 'master' into f20

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