From: Tom Hughes Date: Sun, 9 May 2010 11:26:40 +0000 (+0100) Subject: Merge branch 'master' into openid X-Git-Tag: live~6355 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/48d450060b3b5c19bb1fa8e85341d76177de26d2 Merge branch 'master' into openid --- 48d450060b3b5c19bb1fa8e85341d76177de26d2