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

[Rex Dieter]

commit df9557ba980f8f498f520247f933d44bb0834498
Merge: 27a1c47 126590a
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sat Oct 11 22:11:23 2014 -0500

    Merge branch 'master' into f20

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