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

[Rex Dieter]

commit 7901074ea4783aa57ca5017b575f5c68f468962c
Merge: cfacb73 4f757f7
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jun 30 23:03:43 2014 -0500

    Merge branch 'master' into f20

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