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

Merge branch 'master' into openID
---

9448eab143cd052e9ee48cabdf13a8525add1b2c