[openstreetmap-carto] 02/04: Merge tag 'upstream/2.40.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 de5dcc03d2835a74a45a070db612ecff00ffbc99
Merge: d9d4d2e a88c47f
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Wed Jun 22 06:59:11 2016 +0200

    Merge tag 'upstream/2.40.0'
    
    Upstream version 2.40.0

 CONTRIBUTING.md           |  34 ++++++
 INSTALL.md                |   8 ++
 amenity-points.mss        | 108 ++++++++++---------
 indexes.sql               |  37 +++++++
 indexes.yml               |  34 ++++++
 openstreetmap-carto.style |  11 +-
 placenames.mss            |  18 +++-
 power.mss                 |  19 +++-
 project.mml               |  40 +++----
 project.yaml              | 163 +++++++++++++++-------------
 roads.mss                 | 263 +++++++++++++++++++++++++---------------------
 scripts/README.md         |   3 +
 scripts/indexes.py        |  72 +++++++++++++
 scripts/shop_values.rb    |   6 ++
 symbols/library.14.svg    |  38 +++++++
 symbols/library.p.20.png  | Bin 715 -> 0 bytes
 symbols/shop_books.16.svg |  12 ---
 17 files changed, 573 insertions(+), 293 deletions(-)

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