]> git.openstreetmap.org Git - nominatim.git/commitdiff
Merge remote-tracking branch 'upstream/master'
authorSarah Hoffmann <lonvia@denofr.de>
Thu, 10 Apr 2014 21:05:23 +0000 (23:05 +0200)
committerSarah Hoffmann <lonvia@denofr.de>
Thu, 10 Apr 2014 21:05:23 +0000 (23:05 +0200)
Conflicts:
sql/functions.sql


No differences found