[python-mapnik] 02/04: Merge tag 'upstream/0.0_20160531-f65767a'

[Bas Couwenberg]

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

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

commit b04f0ff598dae59538391f737cbab49493f85dd8
Merge: fa58313 9384a74
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun Jun 26 23:07:54 2016 +0200

    Merge tag 'upstream/0.0_20160531-f65767a'
    
    Upstream version 0.0~20160531-f65767a

 mapnik/__init__.py                        | 14 +++++++-------
 setup.py                                  |  1 +
 src/mapnik_datasource.cpp                 |  1 -
 src/mapnik_feature.cpp                    |  1 -
 src/mapnik_featureset.cpp                 |  1 -
 src/mapnik_geometry.cpp                   |  1 -
 src/mapnik_image.cpp                      |  5 ++++-
 src/mapnik_python.cpp                     |  5 +++++
 test/python_tests/geojson_plugin_test.py  | 10 +++++-----
 test/python_tests/topojson_plugin_test.py | 26 ++++++++++++++------------
 10 files changed, 36 insertions(+), 29 deletions(-)

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