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

[Orion Poplawski]

commit 076201a0508c44ec73d384a3a9c2f366bdf17f30
Merge: 239f251 556d466
Author: Orion Poplawski <orion at nwra.com>
Date:   Thu May 8 16:46:57 2014 -0600

    Merge branch 'master' into el6

 grib_api.spec |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---