]> git.openstreetmap.org Git - nominatim.git/commitdiff
Merge remote-tracking branch 'upstream/master'
authorSarah Hoffmann <lonvia@denofr.de>
Wed, 5 Feb 2014 19:19:05 +0000 (20:19 +0100)
committerSarah Hoffmann <lonvia@denofr.de>
Wed, 5 Feb 2014 19:19:05 +0000 (20:19 +0100)
Conflicts:
lib/init-website.php


No differences found