[mapnik] 02/04: Merge tag 'upstream/3.0.13_rc2+ds'

[Bas Couwenberg]

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

sebastic pushed a commit to branch master
in repository mapnik.

commit 446a5daf49cf0c9be012358d3234289b07e4bfdc
Merge: 02fcbc7 a9cd399
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Mon Feb 6 18:56:00 2017 +0100

    Merge tag 'upstream/3.0.13_rc2+ds'
    
    Upstream version 3.0.13~rc2+ds

 .travis.yml                                        | 10 ++--
 CHANGELOG.md                                       |  5 +-
 bootstrap.sh                                       |  4 +-
 circle.yml                                         | 12 ++--
 include/mapnik/box2d.hpp                           |  1 +
 include/mapnik/box2d_impl.hpp                      |  7 ++-
 .../mapnik/json/extract_bounding_box_grammar.hpp   |  2 +-
 .../json/extract_bounding_box_grammar_impl.hpp     | 35 +++++------
 include/mapnik/json/positions_grammar.hpp          |  2 +-
 include/mapnik/json/positions_grammar_impl.hpp     | 12 ++--
 include/mapnik/version.hpp                         |  2 +-
 src/text/symbolizer_helpers.cpp                    | 37 +++++++-----
 test/unit/datasource/geojson.cpp                   | 68 ++++++++++++----------
 utils/mapnik-index/process_geojson_file.cpp        |  5 ++
 14 files changed, 110 insertions(+), 92 deletions(-)

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