From: Tom Hughes <tom@compton.nu>
Date: Fri, 14 May 2010 21:50:17 +0000 (+0100)
Subject: Merge branch 'master' into openid
X-Git-Tag: live~6311
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/9b10cbccb6ab258d6cecc1f8ba32c4ee1781c92f?hp=--cc

Merge branch 'master' into openid

Conflicts:
	config/locales/is.yml
---

9b10cbccb6ab258d6cecc1f8ba32c4ee1781c92f