From: Tom Hughes <tom@compton.nu>
Date: Fri, 24 Sep 2010 08:35:36 +0000 (+0100)
Subject: Merge branch 'master' into openid
X-Git-Tag: live~6321
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/f70feedc6517b824c4201584d6298fd5790d85ba?hp=f70feedc6517b824c4201584d6298fd5790d85ba

Merge branch 'master' into openid
---