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

[Rex Dieter]

commit 5b5d37408351588dd1b1d8ab55ed07ad8d5f0437
Merge: c85bec7 d5d693f
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sat Nov 8 20:08:50 2014 -0600

    Merge branch 'master' into f20

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