From: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Date: Sun, 2 May 2010 10:24:06 +0000 (+0000)
Subject: Merge remote branch 'apmon/openID' into openID
X-Git-Tag: live~6370
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/e21901176001a3c75e3bd2ce38f9158596859374

Merge remote branch 'apmon/openID' into openID
---

e21901176001a3c75e3bd2ce38f9158596859374