From: Eden Halperin <eden.halperin@gmail.com>
Date: Tue, 5 Nov 2013 21:13:04 +0000 (-0500)
Subject: Merge branch 'redesign' of https://github.com/osmlab/openstreetmap-website into redesign
X-Git-Tag: live~4677^2~199^2~2
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/254aaaf5fb2135a9f3f1b343331b4d5b3d94fe74

Merge branch 'redesign' of https://github.com/osmlab/openstreetmap-website into redesign
---

254aaaf5fb2135a9f3f1b343331b4d5b3d94fe74