From: Tom Hughes <tom@compton.nu>
Date: Thu, 9 Sep 2010 08:07:13 +0000 (+0100)
Subject: Merge branch 'master' into openid
X-Git-Tag: live~6293
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/945d60ea5a52d0c1d41cc63456bd6f60e547e79e?hp=-c

Merge branch 'master' into openid
---

945d60ea5a52d0c1d41cc63456bd6f60e547e79e