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

[Rex Dieter]

commit f36067f9f0e31454c99c3bcc02319ee40d646295
Merge: e9030be 7c97e75
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Jan 20 10:43:08 2015 -0600

    Merge branch 'master' into f20

 .gitignore      |    2 ++
 ktuberling.spec |   12 +++++++++---
 sources         |    2 +-
 3 files changed, 12 insertions(+), 4 deletions(-)
---