]> git.openstreetmap.org Git - nominatim.git/commitdiff
Merge remote-tracking branch 'upstream/master'
authorMarc Tobias Metten <mtmail@gmx.net>
Fri, 4 Mar 2016 14:42:29 +0000 (15:42 +0100)
committerMarc Tobias Metten <mtmail@gmx.net>
Fri, 4 Mar 2016 14:42:29 +0000 (15:42 +0100)

Trivial merge