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

[Rex Dieter]

commit f2e4702a5d061a50373f79e414834fe54f5bd580
Merge: 327244e 5ce5df6
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Jul 15 12:40:19 2014 -0500

    Merge branch 'master' into f20

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