From: Tom Hughes <tom@compton.nu>
Date: Thu, 28 Nov 2013 17:30:53 +0000 (+0000)
Subject: Merge branch 'redesign'
X-Git-Tag: live~4668
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/68a3df4d53c84508bf443058040379c3a18eb1a7

Merge branch 'redesign'

Conflicts:
	app/assets/stylesheets/common.css.scss
---

68a3df4d53c84508bf443058040379c3a18eb1a7