From: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Date: Sat, 24 Apr 2010 12:33:29 +0000 (+0000)
Subject: Merge branch 'master' into openID
X-Git-Tag: live~6392
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/735493837b036f5609f42a363c7f58f04525194c

Merge branch 'master' into openID
---

735493837b036f5609f42a363c7f58f04525194c