From: Tom Hughes Date: Sun, 16 May 2010 11:11:01 +0000 (+0100) Subject: Merge branch 'master' into openid X-Git-Tag: live~6320 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/996e60614d9d5a2e43b0ca246d9786d569fb7be2 Merge branch 'master' into openid --- 996e60614d9d5a2e43b0ca246d9786d569fb7be2