]> git.openstreetmap.org Git - nominatim.git/commit
Merge remote-tracking branch 'upstream/master'
authorSarah Hoffmann <lonvia@denofr.de>
Mon, 6 May 2013 19:38:56 +0000 (21:38 +0200)
committerSarah Hoffmann <lonvia@denofr.de>
Mon, 6 May 2013 19:38:56 +0000 (21:38 +0200)
commitb0521f5150093d7b1481bf2739e89a909ec18a56
tree2cd51a3e11541448b726fbaae0de5fb8be76f03d
parent95c0f2a97b2dedc2bede01eed3824a325809d74a
parent0e6cfed1a47da67e2a514204f0c41043a3fca19f
Merge remote-tracking branch 'upstream/master'

Conflicts:
website/search.php
website/search.php