]> git.openstreetmap.org Git - nominatim.git/commitdiff
Merge remote-tracking branch 'upstream/master'
authorSarah Hoffmann <lonvia@denofr.de>
Wed, 1 May 2013 09:11:06 +0000 (11:11 +0200)
committerSarah Hoffmann <lonvia@denofr.de>
Wed, 1 May 2013 09:11:06 +0000 (11:11 +0200)
1  2 
utils/setup.php
website/search.php

diff --cc utils/setup.php
Simple merge
Simple merge