From: Tom Hughes <tom@compton.nu>
Date: Sat, 8 Mar 2014 17:44:22 +0000 (+0000)
Subject: Merge remote-tracking branch 'origin/master' into routing
X-Git-Tag: live~4256^2~23^2
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/b095b59d5e0ee805e49980af80b21bd1acff1345?hp=b095b59d5e0ee805e49980af80b21bd1acff1345

Merge remote-tracking branch 'origin/master' into routing

Conflicts:
	app/views/layouts/_search.html.erb
---