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

[Rex Dieter]

commit 8411161f49054de2f26ced76a8f2504fd0e229a2
Merge: 2030645 77785c2
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Jul 15 12:34:38 2014 -0500

    Merge branch 'master' into f20

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