]> git.openstreetmap.org Git - nominatim.git/commit
Merge remote-tracking branch 'upstream/master'
authorSarah Hoffmann <lonvia@denofr.de>
Tue, 17 Sep 2013 16:54:52 +0000 (18:54 +0200)
committerSarah Hoffmann <lonvia@denofr.de>
Tue, 17 Sep 2013 16:54:52 +0000 (18:54 +0200)
commit42f6820a7fe67c5daa4dd3645163ac3611ee8e17
tree05f4a2d786a5638853633e78a10a087271d5b3ff
parent31126328e984429d8b800f4750be2776fc19488a
parent124032c27b8919c40e10be0b4e4971c8e51bef0b
Merge remote-tracking branch 'upstream/master'

Conflicts:
utils/update.php
lib/Geocode.php
utils/setup.php
utils/update.php