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

[Rex Dieter]

commit ddbb170a4fcdb4f92578f9c214ae0304f2b69004
Merge: feac066 39a5a27
Author: Rex Dieter <rdieter at gmail.com>
Date:   Sun Mar 1 17:08:06 2015 -0600

    Merge branch 'master' into f20

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