[cervisia/f20: 5/5] Merge branch 'master' into f20

[Rex Dieter]

commit d4f54cb53b0d4aa205f0016779a4c29648dcac06
Merge: 157717f 3300f39
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Sep 16 19:59:15 2014 -0500

    Merge branch 'master' into f20

 .gitignore    |    3 +++
 cervisia.spec |   14 +++++++++++++-
 sources       |    2 +-
 3 files changed, 17 insertions(+), 2 deletions(-)
---