From: Tom Hughes <tom@compton.nu>
Date: Thu, 28 Mar 2013 00:36:07 +0000 (+0000)
Subject: Merge branch 'master' into notes
X-Git-Tag: live~6110^2~13
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/898cc828dd1f1167f85abbf35c8e3f0ed640ac1e?hp=898cc828dd1f1167f85abbf35c8e3f0ed640ac1e

Merge branch 'master' into notes

Conflicts:
	Gemfile.lock
---