From: Tom Hughes Date: Thu, 13 May 2010 12:36:31 +0000 (+0100) Subject: Merge branch 'master' into openid X-Git-Tag: live~6837 X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/b917a0eba07184571ea62bb7b735eb48d7c04634 Merge branch 'master' into openid --- b917a0eba07184571ea62bb7b735eb48d7c04634