From: Tom Hughes Date: Wed, 28 Jul 2010 20:39:46 +0000 (+0100) Subject: Merge branch 'master' into openid X-Git-Tag: live~6274 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/03fb042591bf60cd74aa277ee3de98f02d8486d3 Merge branch 'master' into openid --- 03fb042591bf60cd74aa277ee3de98f02d8486d3