From: Sarah Hoffmann <lonvia@denofr.de>
Date: Thu, 10 Apr 2014 21:05:23 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~544
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/671c08848c1531f0c52f0dfff9448086a6fc09cb

Merge remote-tracking branch 'upstream/master'

Conflicts:
	sql/functions.sql
---

671c08848c1531f0c52f0dfff9448086a6fc09cb