From: Tom Hughes <tom@compton.nu>
Date: Sun, 22 Jun 2008 12:23:43 +0000 (+0000)
Subject: Merge 7922:8377 from trunk.
X-Git-Tag: live~7761^2~5
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/960d13488a875245570ee498ee9a1ed7cac37bbe

Merge 7922:8377 from trunk.
---

960d13488a875245570ee498ee9a1ed7cac37bbe