From: Sarah Hoffmann <lonvia@denofr.de>
Date: Fri, 19 Apr 2013 22:20:58 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~618
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/be61d055469ac955205b64351b1533647bd4ddca?hp=be61d055469ac955205b64351b1533647bd4ddca

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