]> git.openstreetmap.org Git - nominatim.git/commitdiff
Merge remote-tracking branch 'upstream/master' into travis-ci
authorMarc Tobias Metten <mtmail@gmx.net>
Sat, 30 Jul 2016 19:53:27 +0000 (21:53 +0200)
committerMarc Tobias Metten <mtmail@gmx.net>
Sat, 30 Jul 2016 19:53:27 +0000 (21:53 +0200)

Trivial merge