From: Tom Hughes <tom@compton.nu>
Date: Sat, 21 May 2011 10:21:01 +0000 (+0100)
Subject: Merge branch 'master' into openstreetbugs
X-Git-Tag: live~5068^2~152
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/bb490aca81d8063a9ad8dd8f1a023c709c096792

Merge branch 'master' into openstreetbugs

Conflicts:
	config/environment.rb
---

bb490aca81d8063a9ad8dd8f1a023c709c096792