From: Tom Hughes <tom@compton.nu>
Date: Sun, 9 May 2010 16:16:43 +0000 (+0100)
Subject: Merge branch 'master' into terms
X-Git-Tag: live~6405^2~6
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/61e51f88cc0242dadd3939cd0bbb5197a21cfb94

Merge branch 'master' into terms
---

61e51f88cc0242dadd3939cd0bbb5197a21cfb94