]> git.openstreetmap.org Git - nominatim.git/commitdiff
Merge remote-tracking branch 'upstream/master'
authorSarah Hoffmann <lonvia@denofr.de>
Tue, 10 Sep 2013 17:09:17 +0000 (19:09 +0200)
committerSarah Hoffmann <lonvia@denofr.de>
Tue, 10 Sep 2013 17:09:17 +0000 (19:09 +0200)
Conflicts:
website/search.php


No differences found