]> git.openstreetmap.org Git - nominatim.git/commit
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)
commit671c08848c1531f0c52f0dfff9448086a6fc09cb
tree73ed5ccaa8e38631b48afde72eff54bb31a5cbcb
parent15266a9fdd6630a3ce767d5e4a33ff670948a600
parent589bad809ef11bd8fe94ffa006e1255efec72480
Merge remote-tracking branch 'upstream/master'

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