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

[Rex Dieter]

commit 14eba940f3452c6dd93ba0a933e83263c1f8a38e
Merge: 8411161 bbe1a77
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Sep 16 20:18:02 2014 -0500

    Merge branch 'master' into f20

 .gitignore       |    3 +++
 kfourinline.spec |   14 +++++++++++++-
 sources          |    2 +-
 3 files changed, 17 insertions(+), 2 deletions(-)
---