]> git.openstreetmap.org Git - nominatim.git/commit
Merge remote-tracking branch 'upstream/master'
authorSarah Hoffmann <lonvia@denofr.de>
Tue, 22 Jan 2013 07:14:58 +0000 (08:14 +0100)
committerSarah Hoffmann <lonvia@denofr.de>
Tue, 22 Jan 2013 07:14:58 +0000 (08:14 +0100)
commit5140b12aa290e7de8fd0c53f4977e881e5fee0e1
tree38a8bce6e193f4e8e5f6e9506f6a6fe1e5a2359d
parentb57dc6addfe6d91ad78642d1f6881d206b7e425a
parent3dba772852378683e864feab37f5a74b803e6030
Merge remote-tracking branch 'upstream/master'

Conflicts:
sql/partition-functions.src.sql
sql/partition-tables.src.sql
sql/partition-tables.src.sql
utils/setup.php