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

[Rex Dieter]

commit e9030be9cfde809d7c661b9cb7bb34011e49c618
Merge: 0b4427e b230b76
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sat Nov 8 20:24:20 2014 -0600

    Merge branch 'master' into f20

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