From: Tom Hughes <tom@compton.nu>
Date: Tue, 11 May 2010 18:45:48 +0000 (+0100)
Subject: Merge branch 'master' of git://git.openstreetmap.org/rails
X-Git-Tag: live~6881^2
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/2e43a275de10e162d605df71e3e0f16ba596ad25?hp=--cc

Merge branch 'master' of git://git.openstreetmap.org/rails
---

2e43a275de10e162d605df71e3e0f16ba596ad25