Merge remote-tracking branch 'openstreetmap/pull/1040'
authorTom Hughes <tom@compton.nu>
Thu, 27 Aug 2015 20:30:50 +0000 (21:30 +0100)
committerTom Hughes <tom@compton.nu>
Thu, 27 Aug 2015 20:30:50 +0000 (21:30 +0100)
commitdb7374f2bbdd0b3ee0f3cb0a9cca84f9c72cffb5
treebf37509a71cd2c8c827fe87b58084311c034788d
parentdca0be1886d9b9fcd2cab1b7c82ac4132fbf722b
parent6d511fbd34f5e9b63d5dd1594e50856fe22c36bf
Merge remote-tracking branch 'openstreetmap/pull/1040'