From: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Date: Tue, 27 Apr 2010 20:03:03 +0000 (+0000)
Subject: Merge branch 'master' into openID
X-Git-Tag: live~6381
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/f699368335694f663755c7f714a1ac358bc679cb

Merge branch 'master' into openID
---

f699368335694f663755c7f714a1ac358bc679cb