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

[Rex Dieter]

commit f24010a16c0f5a85efc8696bacf1ce974cad1f0e
Merge: cf8366d 4bb507b
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Sep 16 20:19:04 2014 -0500

    Merge branch 'master' into f20

 .gitignore       |    3 +++
 kgoldrunner.spec |   14 +++++++++++++-
 sources          |    2 +-
 3 files changed, 17 insertions(+), 2 deletions(-)
---