]> git.openstreetmap.org Git - nominatim.git/commitdiff
Merge remote-tracking branch 'upstream/master'
authorSarah Hoffmann <sarah.hoffmann@kernkonzept.com>
Mon, 26 Jan 2015 08:39:56 +0000 (09:39 +0100)
committerSarah Hoffmann <sarah.hoffmann@kernkonzept.com>
Mon, 26 Jan 2015 08:39:56 +0000 (09:39 +0100)

Trivial merge