]> git.openstreetmap.org Git - nominatim.git/commitdiff
Merge remote-tracking branch 'upstream/master'
authorSarah Hoffmann <lonvia@denofr.de>
Sun, 5 Oct 2014 20:16:43 +0000 (22:16 +0200)
committerSarah Hoffmann <lonvia@denofr.de>
Sun, 5 Oct 2014 20:16:43 +0000 (22:16 +0200)
1  2 
sql/functions.sql
utils/setup.php

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