From: Tom Hughes <tom@compton.nu>
Date: Tue, 6 Oct 2009 12:37:49 +0000 (+0000)
Subject: Merge blocking branch to head.
X-Git-Tag: live~6599
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/32f86316712b8b781dfc2ffde0a5b88b742a6627

Merge blocking branch to head.
---

32f86316712b8b781dfc2ffde0a5b88b742a6627