From: Tom Hughes Date: Wed, 16 Jun 2010 20:18:44 +0000 (+0100) Subject: Merge branch 'master' into openid X-Git-Tag: live~7285 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/6a3cadb52d010b333a4acea8942bc4c13394e236 Merge branch 'master' into openid --- 6a3cadb52d010b333a4acea8942bc4c13394e236