]> git.openstreetmap.org Git - nominatim.git/commit
Merge remote-tracking branch 'upstream/master'
authorSarah Hoffmann <lonvia@denofr.de>
Fri, 12 Apr 2013 21:23:36 +0000 (23:23 +0200)
committerSarah Hoffmann <lonvia@denofr.de>
Fri, 12 Apr 2013 21:23:36 +0000 (23:23 +0200)
commit12c1deeb8a313873af7c33c878f48a819305b483
tree3b9f2aade74818eb80c25155c2f1387360a1f381
parent9f880c367c4a9fd8a2950011eeba22c77ab0c914
parent9e0a92a508743d3bc30b332e94742eeeb5cb8ce2
Merge remote-tracking branch 'upstream/master'

Conflicts:
lib/log.php
website/reverse.php
website/search.php
lib/log.php
settings/settings.php
website/reverse.php
website/search.php