]> git.openstreetmap.org Git - nominatim.git/commit
Merge remote-tracking branch 'upstream/master'
authorSarah Hoffmann <lonvia@denofr.de>
Thu, 13 Mar 2014 19:48:21 +0000 (20:48 +0100)
committerSarah Hoffmann <lonvia@denofr.de>
Thu, 13 Mar 2014 19:48:21 +0000 (20:48 +0100)
commit33f7bba69858405517c68a4aaf609ce69e00e277
tree567dd41b6b32671c68d33f5a6176608f90f298e3
parentf404b81388537f33a4a9355991f8eeecd914a5b9
parent0b9618e3490bea5f18073cd84de1c21400dca48d
Merge remote-tracking branch 'upstream/master'

Conflicts:
lib/Geocode.php
lib/Geocode.php