[osm2pgsql] 02/08: Merge tag 'upstream/0.87.2'

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch master
in repository osm2pgsql.

commit 952c0c4e0c58f96cb04dde18725653de880f03a1
Merge: 15d6fc9 a4edaef
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Tue Feb 24 09:00:36 2015 +0100

    Merge tag 'upstream/0.87.2'
    
    Upstream version 0.87.2

 README.md                |   12 +
 building.lua             |  124 ----
 configure.ac             |   31 +-
 default.style            |   14 +-
 docs/migrations.md       |   22 +
 docs/multi.md            |    7 +-
 docs/usage.md            |    7 +-
 expire-tiles.cpp         |    1 +
 expire-tiles.hpp         |    3 +-
 geometry-builder.cpp     |   43 +-
 m4/ax_lua.m4             |  234 +++---
 middle-pgsql.cpp         |   51 +-
 multi.lua                |  130 ++++
 multi.style.json         |   41 +
 options.cpp              |   12 +-
 osmdata.cpp              |   14 +-
 osmtypes.hpp             |    7 -
 output-gazetteer.cpp     | 1847 +++++++++++++++-------------------------------
 output-gazetteer.hpp     |  267 ++++++-
 output-pgsql.cpp         |   42 +-
 output.hpp               |    2 +-
 pgsql.cpp                |   43 +-
 pgsql.hpp                |   14 +-
 table.cpp                |   16 +-
 table.hpp                |    2 +-
 tests/regression-test.py |   12 +-
 util.cpp                 |    5 +-
 util.hpp                 |    4 -
 28 files changed, 1338 insertions(+), 1669 deletions(-)

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