Merge remote-tracking branch 'openstreetmap/pull/1122'
authorTom Hughes <tom@compton.nu>
Wed, 9 Mar 2016 19:05:16 +0000 (19:05 +0000)
committerTom Hughes <tom@compton.nu>
Wed, 9 Mar 2016 19:05:16 +0000 (19:05 +0000)
commitca5de5b4e01297b07ce3a9db45e908f15f7cda11
tree6b1f450aae86b97e27431794f15fa58fab0e384c
parent6f144e8b7dbedab09042f461bd55d357c8896612
parent1efbcc3ff46d32c6a575ff917d7d2eba6e3472df
Merge remote-tracking branch 'openstreetmap/pull/1122'