From: Sarah Hoffmann <lonvia@denofr.de>
Date: Fri, 8 Feb 2013 18:23:46 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~633
X-Git-Url: https://git.openstreetmap.org/nominatim.git/commitdiff_plain/d8bc544a455332cc3eb7fc43c03c12eaf771b7de

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

d8bc544a455332cc3eb7fc43c03c12eaf771b7de