[openstreetmap-carto] 02/03: Merge tag 'upstream/3.1.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 9cf8de990dc8d7217b6408ba8c3edc4f0056400f
Merge: 720f8cc 08e6e8e
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun Jan 29 10:28:10 2017 +0100

    Merge tag 'upstream/3.1.0'
    
    Upstream version 3.1.0

 CHANGELOG.md            |  14 +-
 LICENSE.txt             |   5 +-
 amenity-points.mss      |  20 +-
 landcover.mss           |   1 +
 placenames.mss          | 175 ++++++++---
 project.mml             | 814 ++++++++++++++++++++++--------------------------
 symbols/bus_stop.12.svg |  17 +-
 symbols/shop/coffee.svg |   9 +
 8 files changed, 555 insertions(+), 500 deletions(-)

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