From: Sarah Hoffmann <lonvia@denofr.de>
Date: Sun, 1 Feb 2015 12:00:14 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~485
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/c1fdb9a915f673239f686ff37da03da10ea1186c?hp=c1fdb9a915f673239f686ff37da03da10ea1186c

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