[kgoldrunner/f20: 10/10] Merge branch 'master' into f20

[Rex Dieter]

commit 14daa1244446c36f51ad2062cb9129f960ef7e62
Merge: 731c771 7794fd0
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jun 30 22:59:41 2014 -0500

    Merge branch 'master' into f20

 .gitignore       |    6 ++++++
 kgoldrunner.spec |   23 ++++++++++++++++++++++-
 sources          |    2 +-
 3 files changed, 29 insertions(+), 2 deletions(-)
---