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

[Rex Dieter]

commit 993409a365eeb6adb458bdb18c988bed0bf2da87
Merge: f40d129 7965060
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Jul 15 12:47:51 2014 -0500

    Merge branch 'master' into f20

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