]> git.openstreetmap.org Git - nominatim.git/commitdiff
Merge remote-tracking branch 'upstream/master'
authorSarah Hoffmann <lonvia@denofr.de>
Sun, 16 Dec 2012 15:25:58 +0000 (16:25 +0100)
committerSarah Hoffmann <lonvia@denofr.de>
Sun, 16 Dec 2012 15:25:58 +0000 (16:25 +0100)
1  2 
utils/setup.php

diff --cc utils/setup.php
Simple merge