From: Sarah Hoffmann <lonvia@denofr.de>
Date: Thu, 31 Jan 2013 19:57:31 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~635
X-Git-Url: https://git.openstreetmap.org/nominatim.git/commitdiff_plain/ea04658bde5c61965442562889292351b8df79ec

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

ea04658bde5c61965442562889292351b8df79ec