From: Sarah Hoffmann <lonvia@denofr.de>
Date: Sun, 11 Jan 2015 14:40:37 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~492
X-Git-Url: https://git.openstreetmap.org/nominatim.git/commitdiff_plain/d6fa3ce8ff49fe56f24d10975e83c8b4b65e5f79?hp=d6fa3ce8ff49fe56f24d10975e83c8b4b65e5f79

Merge remote-tracking branch 'upstream/master'

Conflicts:
	sql/tiger_import_finish.sql
---