From: Tom Hughes Date: Mon, 17 May 2010 23:16:47 +0000 (+0100) Subject: Merge branch 'master' into openid X-Git-Tag: live~6307 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/9f0ea60679c5e13ec321572f02afa5d265ce0c46 Merge branch 'master' into openid --- 9f0ea60679c5e13ec321572f02afa5d265ce0c46