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

[Rex Dieter]

commit 969b6d3d9c3ba91e40bd9d49cffe28e4d51815fc
Merge: 174d9a7 36baee8
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Feb 3 10:02:39 2014 -0600

    Merge branch 'master' into f20

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