From: Tom Hughes <tom@compton.nu>
Date: Mon, 19 Apr 2010 20:05:54 +0000 (+0100)
Subject: Merge branch 'master' into terms
X-Git-Tag: live~6322^2~15
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/4b2ac2ea2b4f914a87537c099f699a5351f22d82

Merge branch 'master' into terms
---

4b2ac2ea2b4f914a87537c099f699a5351f22d82