]> git.openstreetmap.org Git - nominatim.git/commit
Merge remote-tracking branch 'upstream/master'
authorSarah Hoffmann <lonvia@denofr.de>
Sun, 7 Sep 2014 16:02:39 +0000 (18:02 +0200)
committerSarah Hoffmann <lonvia@denofr.de>
Sun, 7 Sep 2014 16:02:39 +0000 (18:02 +0200)
commit65aba66c99903322bc56c7ca99ac29446dd94d09
treebd295c5266bf51d4a738f98b0122628c1f8dc548
parentb70b2213a542595f3a890445103031e5b72e847b
parent031f20c3e67f9237a5dec6f7fce7af12672245ff
Merge remote-tracking branch 'upstream/master'

Conflicts:
sql/indices.src.sql
sql/indices.src.sql