]> git.openstreetmap.org Git - nominatim.git/commitdiff
Merge remote-tracking branch 'upstream/master'
authorSarah Hoffmann <lonvia@denofr.de>
Wed, 24 Sep 2014 21:22:53 +0000 (23:22 +0200)
committerSarah Hoffmann <lonvia@denofr.de>
Wed, 24 Sep 2014 21:22:53 +0000 (23:22 +0200)

Trivial merge