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

[Rex Dieter]

commit ccf9ad91930d7de0cc6637e3ccbcde0e389b4f66
Merge: 2fa6d58 5b0ecba
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sat Nov 8 19:50:29 2014 -0600

    Merge branch 'master' into f20

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