[osm2pgsql] 03/07: Merge tag 'upstream/0.94.0_rc2+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 2bd98891a34742b80d330e5202c3193c01887861
Merge: 96dfc22 2444233
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Wed Oct 4 07:33:28 2017 +0200

    Merge tag 'upstream/0.94.0_rc2+ds'
    
    Upstream version 0.94.0~rc2+ds

 options.cpp |  2 +-
 table.cpp   | 51 ++++++++++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 51 insertions(+), 2 deletions(-)

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