From: Tom Hughes <tom@compton.nu>
Date: Tue, 11 May 2010 18:07:00 +0000 (+0100)
Subject: Merge branch 'master' into terms
X-Git-Tag: live~6351^2~4
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/836e926e629a140fcdbb4b8489dc2caba5018439

Merge branch 'master' into terms
---

836e926e629a140fcdbb4b8489dc2caba5018439