From: Tom Hughes <tom@compton.nu>
Date: Sun, 16 May 2010 13:49:45 +0000 (+0100)
Subject: Merge branch 'master' into openid
X-Git-Tag: live~6282
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/7b9e852c9d53318cfc949fe4ceef2d3b665e2020?hp=--cc

Merge branch 'master' into openid
---

7b9e852c9d53318cfc949fe4ceef2d3b665e2020