Fix comma in the prepare for delete_node
Merge remote branch 'upstream/master'
Merge pull request #104 from jeffjanes/master

Fix comma in the prepare for delete_node
Fixed crash related to missing lon/lat in deletions

Previously if when attempting to delete a node osm2pgsql would crash if
the lon/lat was not provided even though this data was not necessary.
It will still crash if you are not trying to delete.
Merge branch 'master' of github.com:mr/osm2pgsql
Make postgis database script work with postgis 2 and postgresql 9.3
as used in Ubuntu 14.04
Fix syntax error in install script
Remove deadcode from binary_search_get() in binarysearcharray.c
Remove bz2 support from pbf file

bz2 support is deprecated in pbf files, and code is missing a BZ2_bzDecompress()
Fix indentation in get_wkt() from build_geometry.cpp
Don't dereference result pointer with strcpy if NULL
Merge pull request #134 from jocelynj/code-fix

Minor code fixes
removed fillfactor from hstore gin indexes

fillfactor causes error in postgres 9.3 since it is
not a supported parameter to GIN indexes, see:
http://www.postgresql.org/docs/9.3/static/sql-createindex.html
Add missing ignore of osm_timestamp in tagtransform_c_filter_rel_member_tags()

When reading a .osm or .o5m instead of .osm.pbf file, this caused osm2pgsql to
generate ways included in relations in planet_osm_polygons in addition to the
relation.
Get changeset attribute from .osm file, to align with .osm.pbf
Merge pull request #136 from jocelynj/osm-fixes

Unwanted way in planet_osm_polygon with test .osm
fix header guard typos and add missing ones
Add additional generated files to .gitignore.
Allow maintainer mode to be disabled (debian build scripts do this).
Add ZLIB_CFLAGS to CFLAGS.