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

[Rex Dieter]

commit 4d6fb1d06b0bf727f4fe969b5e39f882f5be0259
Merge: df9557b ef608ea
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sat Nov 8 20:12:01 2014 -0600

    Merge branch 'master' into f20

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