From: Tom Hughes <tom@compton.nu>
Date: Tue, 5 Feb 2013 19:03:28 +0000 (+0000)
Subject: Merge branch 'master' into notes
X-Git-Tag: live~5068^2~20
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/8090e086daad67eac711ad6fd6a5eba6f28d44fd

Merge branch 'master' into notes
---

8090e086daad67eac711ad6fd6a5eba6f28d44fd