[grib_api/el6: 2/2] Merge branch 'master' into el6

[Orion Poplawski]

commit 32d3895a2c18dc4d94d430114824c602ea03c96c
Merge: 4429505 36e9ed5
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Mon Oct 20 10:10:01 2014 -0600

    Merge branch 'master' into el6

 grib_api.spec |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)
---