From: Tom Hughes <tom@compton.nu>
Date: Mon, 7 Jun 2010 21:24:24 +0000 (+0100)
Subject: Merge branch 'master' into openid
X-Git-Tag: live~6294
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/dc35b597a2210d77e3d3e6996138dfdeb3add4a3?hp=dc35b597a2210d77e3d3e6996138dfdeb3add4a3

Merge branch 'master' into openid

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