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

[Rex Dieter]

commit 2ba95ab47ae2756378281ecf67451a5cb4a365b1
Merge: 0f7e8de ed0503b
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sat Nov 8 20:12:55 2014 -0600

    Merge branch 'master' into f20

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