[python-mapnik] 02/10: Merge tag 'upstream/0.0_20160217-d57dce9'

[Sebastiaan 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 cde76418827691c5c2c55d172588ffa17e440725
Merge: 2b79f4b 3ea6787
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Feb 27 00:01:34 2016 +0100

    Merge tag 'upstream/0.0_20160217-d57dce9'
    
    Upstream version 0.0~20160217-d57dce9

 mapnik/__init__.py                                 |  24 ++++++------
 setup.py                                           |  42 +++++++++++++--------
 src/mapnik_datasource.cpp                          |   1 +
 src/mapnik_feature.cpp                             |   1 +
 src/mapnik_featureset.cpp                          |   1 +
 src/mapnik_geometry.cpp                            |   1 +
 src/mapnik_image.cpp                               |   1 +
 src/mapnik_map.cpp                                 |   2 +-
 src/mapnik_value_converter.hpp                     |   6 +--
 test/python_tests/image_encoding_speed_test.py     |   4 +-
 .../images/pycairo/cairo-cairo-expected.png        | Bin 3624 -> 4439 bytes
 .../images/pycairo/cairo-cairo-expected.svg        |  41 ++++++++++----------
 test/python_tests/png_encoding_test.py             |   4 +-
 13 files changed, 72 insertions(+), 56 deletions(-)

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