From: Tom Hughes <tom@compton.nu>
Date: Fri, 23 Aug 2013 16:40:57 +0000 (+0100)
Subject: Merge remote-tracking branch 'osmlab/user-display'
X-Git-Tag: live~4790
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/fa339033e1f00f4f3e2b9c790c5100a863cf91ac

Merge remote-tracking branch 'osmlab/user-display'
---

fa339033e1f00f4f3e2b9c790c5100a863cf91ac