[osm2pgsql] 02/05: Merge tag 'upstream/0.92.1+ds'

[Bas Couwenberg]

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

sebastic pushed a commit to branch master
in repository osm2pgsql.

commit 2cfa090f970fd932a28c72f08bfce2d143d15641
Merge: 16ecb7a 5e8895b
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Thu Apr 13 23:51:42 2017 +0200

    Merge tag 'upstream/0.92.1+ds'
    
    Upstream version 0.92.1+ds

 CMakeLists.txt   | 2 +-
 output-multi.cpp | 4 ++--
 parse-osmium.cpp | 3 +++
 3 files changed, 6 insertions(+), 3 deletions(-)

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