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

[Rex Dieter]

commit 57d9bc2dfbaa3ec762c4f3cdfb5e6b3db0c2d9f9
Merge: 25987fb da54c0f
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jun 30 22:36:17 2014 -0500

    Merge branch 'master' into f20

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