[mapnik] 02/04: Merge tag 'upstream/3.0.12_rc3+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 2b3810ef257008a0303ab5efff89829c63762deb
Merge: 1b43f59 8f8d94b
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Aug 12 19:49:14 2016 +0200

    Merge tag 'upstream/3.0.12_rc3+ds'
    
    Upstream version 3.0.12~rc3+ds

 CHANGELOG.md                        | 1 +
 bootstrap.sh                        | 4 ++++
 include/mapnik/json/stringifier.hpp | 2 +-
 test/unit/core/expressions_test.cpp | 6 +++---
 test/unit/datasource/geojson.cpp    | 8 ++++----
 test/unit/datasource/topojson.cpp   | 9 ++++-----
 6 files changed, 17 insertions(+), 13 deletions(-)

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