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

[Rex Dieter]

commit 327244e77ec17153791f16cb329a377f8343dacb
Merge: c98e00c 19671fa
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jun 30 23:06:27 2014 -0500

    Merge branch 'master' into f20

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