]> git.openstreetmap.org Git - nominatim.git/commitdiff
Merge remote-tracking branch 'upstream/master' into travis-ci
authorMarc Tobias Metten <mtmail@gmx.net>
Tue, 2 Aug 2016 23:10:30 +0000 (01:10 +0200)
committerMarc Tobias Metten <mtmail@gmx.net>
Tue, 2 Aug 2016 23:10:30 +0000 (01:10 +0200)

Trivial merge