]> git.openstreetmap.org Git - nominatim.git/commitdiff
Merge remote-tracking branch 'upstream/master'
authorSarah Hoffmann <lonvia@denofr.de>
Sun, 11 Jan 2015 14:40:37 +0000 (15:40 +0100)
committerSarah Hoffmann <lonvia@denofr.de>
Sun, 11 Jan 2015 14:40:37 +0000 (15:40 +0100)
Conflicts:
sql/tiger_import_finish.sql


No differences found