[netcdf4-python] 02/06: Merge tag 'upstream/1.2.0'

[Sebastiaan Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository netcdf4-python.

commit 99fe264113b0bbcf29202a05e62aba92362c76c5
Merge: 239e7da 4a9ecd3
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Thu Sep 24 08:32:54 2015 +0200

    Merge tag 'upstream/1.2.0'
    
    Upstream version 1.2.0

 .travis.yml                             |    27 +-
 Changelog                               |    14 +
 MANIFEST.in                             |     1 +
 README.gh-pages                         |     2 +-
 README.md                               |    11 +
 docs/netCDF4/index.html                 |   502 +-
 examples/tutorial.py                    |    26 +
 include/netCDF4.pxi                     |     8 +
 netCDF4/__init__.py                     |     2 +-
 netCDF4/_netCDF4.c                      | 33438 +++++++++++++++++++-----------
 netCDF4/_netCDF4.pyx                    |   495 +-
 netcdftime/_datetime.c                  |  1522 +-
 netcdftime/netcdftime.py                |    19 +-
 setup.py                                |    16 +-
 test/netcdf_dummy_file.nc               |   Bin 0 -> 16376 bytes
 test/tst_enum.py                        |    66 +
 test/tst_get_variables_by_attributes.py |    45 +
 17 files changed, 23965 insertions(+), 12229 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/netcdf4-python.git