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

[Rex Dieter]

commit 81f33c12f0eb3ca3c78f3da6b7ddfe3032e9a28b
Merge: 1435196 d244cf6
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jun 30 23:04:55 2014 -0500

    Merge branch 'master' into f20

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