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

[Rex Dieter]

commit e4b6033e3810e66b234f9fc7917cbf15ba9ba737
Merge: fa0924b 87e35a7
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sat Nov 8 20:07:35 2014 -0600

    Merge branch 'master' into f20

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