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

[Rex Dieter]

commit 793e6085502d3c1672f945684c668e9d9e8f85dc
Merge: fae3569 441912c
Author: Rex Dieter <rdieter at gmail.com>
Date:   Sun Mar 1 17:08:44 2015 -0600

    Merge branch 'master' into f20

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