From: Tom Hughes <tom@compton.nu>
Date: Fri, 17 Oct 2014 16:21:37 +0000 (+0100)
Subject: Merge remote-tracking branch 'osmlab/iD-1.6.0'
X-Git-Tag: live~4334
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/f5f71dd42c949a655f736e80de11ca51b940fcef?ds=sidebyside

Merge remote-tracking branch 'osmlab/iD-1.6.0'
---

f5f71dd42c949a655f736e80de11ca51b940fcef