From: Sarah Hoffmann <lonvia@denofr.de>
Date: Thu, 12 Sep 2013 17:35:24 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~576
X-Git-Url: https://git.openstreetmap.org/nominatim.git/commitdiff_plain/05e44fad072454584426f8a75976ec12a07910ef

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

05e44fad072454584426f8a75976ec12a07910ef