From: Tom Hughes <tom@compton.nu>
Date: Sat, 10 Mar 2012 15:30:25 +0000 (+0000)
Subject: Merge branch 'master' into openstreetbugs
X-Git-Tag: live~5626^2~109
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/6aca6cfabf21da48567e8197457dae8785b7324d?ds=sidebyside;hp=6aca6cfabf21da48567e8197457dae8785b7324d

Merge branch 'master' into openstreetbugs

Conflicts:
	config/routes.rb
	db/structure.sql
---