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

[Rex Dieter]

commit 0b4427e2db97768fbb1abf7d16dc149e52faf512
Merge: 625c757 826e80d
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sat Oct 11 22:24:31 2014 -0500

    Merge branch 'master' into f20

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