From: Tom Hughes <tom@compton.nu>
Date: Tue, 3 Dec 2013 00:23:16 +0000 (+0000)
Subject: Merge remote-tracking branch 'jfirebaugh/562'
X-Git-Tag: live~4565
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/691352136ab17e4a84394a5b80e758c8a1ce92a0?hp=-c;ds=sidebyside

Merge remote-tracking branch 'jfirebaugh/562'
---

691352136ab17e4a84394a5b80e758c8a1ce92a0