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

[Rex Dieter]

commit 5260f496de082320aae6bf82a5e1a09e8e001851
Merge: 99393ac 243fbb2
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Feb 3 07:14:45 2014 -0600

    Merge branch 'master' into f20

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