[kmplot/f20: 7/7] Merge branch 'master' into f20

[Rex Dieter]

commit c9d420f8c1199202aae8f2436b4b73900d0373f4
Merge: f2e4702 1fa1eda
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Sep 16 20:25:00 2014 -0500

    Merge branch 'master' into f20

 .gitignore  |    3 +++
 kmplot.spec |   20 +++++++++++++++++++-
 sources     |    2 +-
 3 files changed, 23 insertions(+), 2 deletions(-)
---