[pyresample] 02/04: Merge tag 'upstream/1.2.9'

[Antonio Valentino]

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

a_valentino-guest pushed a commit to branch master
in repository pyresample.

commit b22528ac8d4eecf23dadec7b7a329f1658eed989
Merge: 72e5412 94f3ab3
Author: Antonio Valentino <antonio.valentino at tiscali.it>
Date:   Wed Dec 14 21:21:22 2016 +0000

    Merge tag 'upstream/1.2.9'
    
    Upstream version 1.2.9

 .bumpversion.cfg      |  2 +-
 .travis.yml           |  8 ++++++--
 changelog.rst         | 18 ++++++++++++++++++
 pyresample/version.py |  2 +-
 setup.py              |  2 +-
 5 files changed, 27 insertions(+), 5 deletions(-)

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