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

[Rex Dieter]

commit 20306459e9cb7984ebc5b32c6361104e1ad91cbf
Merge: 101a17c 32c618d
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jun 30 22:58:12 2014 -0500

    Merge branch 'master' into f20

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