From: Tom Hughes <tom@compton.nu>
Date: Sat, 21 May 2011 11:11:40 +0000 (+0100)
Subject: Merge branch 'openID' of git://git.openstreetmap.org/rails into openid
X-Git-Tag: live~6300
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/9cb8311f02e1bd0e2188e3b1db623400aaf8da47

Merge branch 'openID' of git://git.openstreetmap.org/rails into openid
---

9cb8311f02e1bd0e2188e3b1db623400aaf8da47