]> git.openstreetmap.org Git - nominatim.git/commitdiff
Merge branch 'http_proxy' of https://github.com/simonlopez/Nominatim
authorSarah Hoffmann <lonvia@denofr.de>
Fri, 22 May 2015 19:20:51 +0000 (21:20 +0200)
committerSarah Hoffmann <lonvia@denofr.de>
Fri, 22 May 2015 19:20:51 +0000 (21:20 +0200)

Trivial merge