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

[Rex Dieter]

commit 7ede96d838c6522ee962123431737fb0bff02611
Merge: fb658a6 6be17f9
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Jul 15 12:21:41 2014 -0500

    Merge branch 'master' into f20

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