From: Sarah Hoffmann <lonvia@denofr.de>
Date: Thu, 13 Dec 2012 19:33:27 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~653
X-Git-Url: https://git.openstreetmap.org/nominatim.git/commitdiff_plain/73fdf5fae2755ba8c0170ff4b7ebce0aab5c08a4

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

73fdf5fae2755ba8c0170ff4b7ebce0aab5c08a4