]> git.openstreetmap.org Git - nominatim.git/commit
Merge remote-tracking branch 'upstream/master'
authorSarah Hoffmann <lonvia@denofr.de>
Mon, 14 Jan 2013 22:59:30 +0000 (23:59 +0100)
committerSarah Hoffmann <lonvia@denofr.de>
Mon, 14 Jan 2013 22:59:30 +0000 (23:59 +0100)
commit3b960a5bf343f5617326f162c6df3399dce34930
tree9dcf54b86759a1370622470bc8723e10492a6da5
parentbcbba1cb5a4e5a1df3b8f5c79e2a988221adf867
parent4059ee03f68336532f07dce9677ee00f0154ea1a
Merge remote-tracking branch 'upstream/master'

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