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

[Rex Dieter]

commit 157717f34d7d51af2a1d4d874d5183e24fb262d9
Merge: 57d9bc2 84c362b
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Jul 15 12:20:44 2014 -0500

    Merge branch 'master' into f20

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