]> git.openstreetmap.org Git - nominatim.git/commit
Merge remote-tracking branch 'upstream/master'
authorSarah Hoffmann <lonvia@denofr.de>
Tue, 25 Mar 2014 22:52:44 +0000 (23:52 +0100)
committerSarah Hoffmann <lonvia@denofr.de>
Tue, 25 Mar 2014 22:52:44 +0000 (23:52 +0100)
commit15266a9fdd6630a3ce767d5e4a33ff670948a600
treeba7607b810a756ab5d0eba72d3a8a29e8f0aa376
parent33f7bba69858405517c68a4aaf609ce69e00e277
parentf6c7c4fcef6e64b4a29482daddde5be885d7dd04
Merge remote-tracking branch 'upstream/master'

Conflicts:
sql/functions.sql
sql/functions.sql