]> git.openstreetmap.org Git - nominatim.git/commitdiff
Merge remote-tracking branch 'upstream/master'
authorSarah Hoffmann <lonvia@denofr.de>
Fri, 7 Feb 2014 19:20:20 +0000 (20:20 +0100)
committerSarah Hoffmann <lonvia@denofr.de>
Fri, 7 Feb 2014 19:20:20 +0000 (20:20 +0100)
1  2 
sql/functions.sql
utils/setup.php

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