From: Sarah Hoffmann <lonvia@denofr.de>
Date: Wed, 4 Dec 2013 07:14:06 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~562
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/c603ccce31f031253351353f4056197684d9ff81?hp=c603ccce31f031253351353f4056197684d9ff81

Merge remote-tracking branch 'upstream/master'

Conflicts:
	lib/Geocode.php
	utils/update.php
---