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

[Rex Dieter]

commit 53c0d088fb80db62e62f727a332b207c23bc17b5
Merge: 7ede96d 3097d75
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Sep 16 20:00:44 2014 -0500

    Merge branch 'master' into f20

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