]> git.openstreetmap.org Git - nominatim.git/commit
Merge remote-tracking branch 'upstream/master'
authorSarah Hoffmann <lonvia@denofr.de>
Wed, 4 Dec 2013 07:14:06 +0000 (08:14 +0100)
committerSarah Hoffmann <lonvia@denofr.de>
Wed, 4 Dec 2013 07:14:06 +0000 (08:14 +0100)
commitc603ccce31f031253351353f4056197684d9ff81
tree07a6bd23a9bd41202d91d0c5b34501e9a05a1599
parent85b7ea8eedd7471412f289a7b37b450b6d67f0da
parent0687065748bac9a56fe36922fdce15e2010a50a5
Merge remote-tracking branch 'upstream/master'

Conflicts:
lib/Geocode.php
utils/update.php
lib/Geocode.php
sql/functions.sql
utils/update.php