From: Tom Hughes <tom@compton.nu>
Date: Tue, 23 Apr 2013 21:40:21 +0000 (+0100)
Subject: Merge branch 'notes'
X-Git-Tag: live~6502
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/0c8ad2f86edefed72052b402742cadedb0d674d9?hp=0c8ad2f86edefed72052b402742cadedb0d674d9

Merge branch 'notes'

Conflicts:
	Vendorfile
---