From: Tom Hughes <tom@compton.nu>
Date: Sun, 1 Feb 2015 11:32:02 +0000 (+0000)
Subject: Merge branch 'master' into routing
X-Git-Tag: live~4229^2~5^2~7
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/13d650e2dcbe2467a82253097e10d58dddf9d9d2

Merge branch 'master' into routing
---

13d650e2dcbe2467a82253097e10d58dddf9d9d2