]> git.openstreetmap.org Git - nominatim.git/commitdiff
Merge branch 'master' of github.com:twain47/Nominatim
authorBrian Quinion <openstreetmap@brian.quinion.co.uk>
Wed, 23 May 2012 23:43:23 +0000 (01:43 +0200)
committerBrian Quinion <openstreetmap@brian.quinion.co.uk>
Wed, 23 May 2012 23:43:23 +0000 (01:43 +0200)
1  2 
utils/setup.php

diff --cc utils/setup.php
Simple merge