From: Tom Hughes <tom@compton.nu>
Date: Sun, 16 May 2010 13:50:06 +0000 (+0100)
Subject: Merge branch 'master' into openstreetbugs
X-Git-Tag: live~5099^2~208
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/4b17b92da09820dd7bf61a640fd37458b82b06fe

Merge branch 'master' into openstreetbugs
---

4b17b92da09820dd7bf61a640fd37458b82b06fe