From: Tom Hughes <tom@compton.nu>
Date: Mon, 15 Oct 2012 21:38:13 +0000 (+0100)
Subject: Merge branch 'master' into notes
X-Git-Tag: live~5809^2~75
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/3fb931f9a86955faa39bec1fa4f2a731cbc74780

Merge branch 'master' into notes
---

3fb931f9a86955faa39bec1fa4f2a731cbc74780