[netcdf4-python] 02/04: Merge tag 'upstream/1.2.2'

[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 aaf0853925d37fac780b8ae5ce793b6031877da9
Merge: f323a05 e77cf6c
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Jan 2 01:11:05 2016 +0100

    Merge tag 'upstream/1.2.2'
    
    Upstream version 1.2.2

 .travis.yml              |     9 +-
 Changelog                |    29 +
 README.md                |    17 +-
 docs/netCDF4/index.html  |   174 +-
 include/constants.pyx    |     1 +
 include/netCDF4.pxi      |    11 +
 netCDF4/_netCDF4.c       | 23832 +++++++++++++++++++++++++--------------------
 netCDF4/_netCDF4.pyx     |   251 +-
 netCDF4/utils.py         |     6 +-
 netcdftime/netcdftime.py |    27 +-
 setup.py                 |    17 +-
 test/tst_atts.py         |     4 +
 test/tst_masked3.py      |    16 +-
 test/tst_netcdftime.py   |    50 +-
 test/tst_scaled.py       |    16 +-
 test/tst_vlen.py         |     8 +-
 16 files changed, 13463 insertions(+), 11005 deletions(-)

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