From: Tom Hughes <tom@compton.nu>
Date: Mon, 19 Apr 2010 20:57:13 +0000 (+0100)
Subject: Merge branch 'master' into copyright
X-Git-Tag: live~6363^2~4^2~1
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/7a5ac0394dfcd5d1cd5a8b659563ddd7afc33332?hp=-c

Merge branch 'master' into copyright
---

7a5ac0394dfcd5d1cd5a8b659563ddd7afc33332