[openstreetmap-carto] 02/04: Merge tag 'upstream/4.0.0'

[Bas Couwenberg]

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

sebastic pushed a commit to branch master
in repository openstreetmap-carto.

commit f170ce8935704d0aed14449a45ec70c3734e9714
Merge: 5b43e0e c408e5a
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun May 28 10:11:37 2017 +0200

    Merge tag 'upstream/4.0.0'
    
    Upstream version 4.0.0

 .travis.yml                         |   9 +-
 CHANGELOG.md                        |  17 +-
 CONTRIBUTING.md                     |  14 +-
 INSTALL.md                          |   8 +-
 README.md                           |   7 +-
 openstreetmap-carto.lua             | 422 ++++++++++++++++++++++++++++++++++++
 openstreetmap-carto.style           | 141 ++----------
 project.mml                         | 100 ++++-----
 scripts/lua/README.md               |   5 +
 scripts/lua/openstreetmap-carto.lua |   1 +
 scripts/lua/test.lua                | 165 ++++++++++++++
 water.mss                           |  12 +-
 12 files changed, 712 insertions(+), 189 deletions(-)

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