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

[Bas 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 db63945fd2c5ba5f89dbb238379202518c315b26
Merge: 203b7a0 95be670
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Dec 10 19:20:42 2016 +0100

    Merge tag 'upstream/1.2.6'
    
    Upstream version 1.2.6

 .travis.yml                    |     4 +-
 Changelog                      |    15 +
 README.md                      |     4 +
 docs/netCDF4/index.html        |   153 +-
 netCDF4/_netCDF4.c             | 25306 +++++++++++++++++++--------------------
 netCDF4/_netCDF4.pyx           |   123 +-
 setup.py                       |     2 +-
 test/tst_compound_alignment.py |     3 +-
 test/tst_multifile.py          |     6 +
 9 files changed, 12350 insertions(+), 13266 deletions(-)

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