From: Sarah Hoffmann <lonvia@denofr.de>
Date: Wed, 30 Apr 2014 22:11:21 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~538
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/9c6d30ca956849bab8db239627dfdf4f9eeec6bb?hp=--cc

Merge remote-tracking branch 'upstream/master'

Conflicts:
	lib/Geocode.php
---

9c6d30ca956849bab8db239627dfdf4f9eeec6bb