From: Tom Hughes <tom@compton.nu>
Date: Mon, 7 Jun 2010 21:26:33 +0000 (+0100)
Subject: Merge branch 'master' into openstreetbugs
X-Git-Tag: live~5207^2~207
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/50224b473bce736436d27c64bd46c1910e4d43ec?hp=50224b473bce736436d27c64bd46c1910e4d43ec

Merge branch 'master' into openstreetbugs

Conflicts:
	app/controllers/browse_controller.rb
---