[netcdf4-python/epel7: 5/5] Merge branch 'master' into epel7

[Orion Poplawski]

commit 32ddfd7ae2e11cda7711927a3e116d177959c77e
Merge: 5354e88 9b13f86
Author: Orion Poplawski <orion at nwra.com>
Date:   Wed Jul 9 13:02:07 2014 -0600

    Merge branch 'master' into epel7

 .gitignore          |    1 +
 netcdf4-python.spec |   13 +++++++++++--
 sources             |    2 +-
 3 files changed, 13 insertions(+), 3 deletions(-)
---