From: Tom Hughes <tom@compton.nu>
Date: Fri, 7 May 2010 21:23:20 +0000 (+0100)
Subject: Merge branch 'master' into terms
X-Git-Tag: live~6406^2~7
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/303e5d3eb99284ab4fa41be85f831333f2154b0d?hp=303e5d3eb99284ab4fa41be85f831333f2154b0d

Merge branch 'master' into terms

Conflicts:
	config/application.yml
	lib/osm.rb
	public/stylesheets/common.css
---