]> git.openstreetmap.org Git - nominatim.git/commitdiff
Merge remote-tracking branch 'upstream/master'
authorSarah Hoffmann <lonvia@denofr.de>
Fri, 14 Jun 2013 16:22:31 +0000 (18:22 +0200)
committerSarah Hoffmann <lonvia@denofr.de>
Fri, 14 Jun 2013 16:22:31 +0000 (18:22 +0200)
1  2 
lib/lib.php
utils/setup.php
website/search.php

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