]> git.openstreetmap.org Git - nominatim.git/commit
Merge remote-tracking branch 'upstream/master'
authorSarah Hoffmann <lonvia@denofr.de>
Mon, 20 May 2013 08:51:24 +0000 (10:51 +0200)
committerSarah Hoffmann <lonvia@denofr.de>
Mon, 20 May 2013 08:51:24 +0000 (10:51 +0200)
commitf476dd61ac30d7248e0b729aa1fcd8d414088ad9
tree1bd0b6f5fec8d032f50ecc6a1acf0da0e7370054
parentb3b109b86fb747439f3a66a72bcd046b6278a0b3
parent7d24737e22330bac1bbecfbf5548487a54109879
Merge remote-tracking branch 'upstream/master'

Conflicts:
utils/setup.php
utils/update.php
settings/settings.php
utils/setup.php
utils/update.php