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

[Rex Dieter]

commit 5a662a009ef198a2e26a9f7c32da8c3d91d00ebd
Merge: fe18c25 9097764
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Feb 3 08:59:48 2014 -0600

    Merge branch 'master' into f20

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