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

[Orion Poplawski]

commit 239f25163b082547958baf882af5629c594a9bcf
Merge: 1158e81 80eabd4
Author: Orion Poplawski <orion at nwra.com>
Date:   Thu May 8 16:36:48 2014 -0600

    Merge branch 'master' into el6

 .gitignore    |    1 +
 grib_api.spec |    7 +++++--
 sources       |    2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)
---