[netcdf4-python] 02/05: Merge tag 'upstream/1.2.1'

[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 b11b1e5bcd719b83bd40741462edaa055a3d0d10
Merge: 9e6ea25 5fe4026
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun Oct 18 12:45:04 2015 +0200

    Merge tag 'upstream/1.2.1'
    
    Upstream version 1.2.1

 Changelog                |    13 +
 docs/netCDF4/index.html  |    59 +-
 netCDF4/_netCDF4.c       | 21057 +++++++++++++++++++++++----------------------
 netCDF4/_netCDF4.pyx     |    79 +-
 netCDF4/utils.py         |   124 +-
 netcdftime/netcdftime.py |    20 +-
 setup.py                 |     2 +-
 test/tst_fancyslicing.py |    16 +-
 test/tst_netcdftime.py   |    15 +
 test/tst_slicing.py      |     1 +
 test/tst_utils.py        |     4 +-
 test/tst_vlen.py         |     8 +
 12 files changed, 11177 insertions(+), 10221 deletions(-)

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