]> git.openstreetmap.org Git - nominatim.git/commit
Merge remote-tracking branch 'upstream/master'
authorSarah Hoffmann <lonvia@denofr.de>
Wed, 5 Feb 2014 19:19:05 +0000 (20:19 +0100)
committerSarah Hoffmann <lonvia@denofr.de>
Wed, 5 Feb 2014 19:19:05 +0000 (20:19 +0100)
commit1f2ee8ed77695c2e475508f961db5b37f8d83bd6
tree82e34ec8af6044d4435451f2d86289ba906ee895
parentce32d77a658afe254d792d3a9322a620dccddce9
parent8286abbeb479a18df7b560daccad7673e3f77297
Merge remote-tracking branch 'upstream/master'

Conflicts:
lib/init-website.php
lib/Geocode.php
lib/init-website.php
lib/lib.php
website/search.php