From: Sarah Hoffmann <lonvia@denofr.de>
Date: Mon, 23 Sep 2013 19:55:51 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~574
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/c371bbcfe45904ab56ece73f709b75e5ef6502fd?hp=9a9a6f2b66d1ce4459bff4bf1926f504fc26e515

Merge remote-tracking branch 'upstream/master'
---

diff --git a/AUTHORS b/AUTHORS
index 704d6bed..1769f616 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1 +1,14 @@
-Nominatim was written by Brian Quinion.
+Nominatim was written by:
+
+  Brian Quinion
+  Sarah Hoffmann
+  Frederik Ramm
+  Michael Spreng
+  Daniele Forsi
+  mfn
+  Grant Slater
+  Andree Klattenhoff
+  IrlJidel
+  appelflap
+  b3nn0
+  Spin0us
diff --git a/ChangeLog b/ChangeLog
index e69de29b..19a6a760 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -0,0 +1,28 @@
+2.0.1
+
+ * delete outdated entries from location_area_country
+ * remove remaining uses of INTEGER, to allow node ids larger than 2^31
+
+2.1
+
+ * update to openlayers 2.12 (now custom built)
+ * update fallback OSM boundaries
+ * add support for postgresql 9.2/9.3 and postgis 2.x
+ * add structured queries
+ * add options for polygon output in various formats
+   (geojson, svg, kml, postgis text)
+ * maintenance functions for deleting objects and updating regions
+   (plcae_force_update/place_force_delete)
+ * web view for polygons that need deleting
+ * rate limiting using memcache
+ * improve layout of details page
+ * add support for boundary:postal_code
+ * full CORS support
+ * improve parenting of POIs
+ * support for extract daily diffs from Geofabrik
+ * support for addresses without a street
+   (addr:place and conscription number house numbers)
+ * improve layout of word and search_name_* tables
+ * support for US ZIP+4 codes
+ * refactoring of front-end PHP code
+ * lots of smaller bug fixes
diff --git a/osm2pgsql b/osm2pgsql
index 48377cec..86d1e0ed 160000
--- a/osm2pgsql
+++ b/osm2pgsql
@@ -1 +1 @@
-Subproject commit 48377cecdccacc64528fe070a1495cb2070e833a
+Subproject commit 86d1e0ede1e01593a3d1b4f2284e9c0bab873ce4