From: Tom Hughes <tom@compton.nu>
Date: Sun, 1 Feb 2015 15:10:21 +0000 (+0000)
Subject: Merge branch 'master' into routing
X-Git-Tag: live~4233^2~5^2
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/4be0e9bd103292a22bd2ca7c8f2744f33c4457d3?hp=--cc

Merge branch 'master' into routing
---

4be0e9bd103292a22bd2ca7c8f2744f33c4457d3