From: Tom Hughes <tom@compton.nu>
Date: Mon, 8 Apr 2013 21:34:37 +0000 (+0100)
Subject: Merge branch 'master' into notes
X-Git-Tag: live~5180^2~1
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/7f598ab412674ce5a78da98c54aa2fe2e4a05792?hp=7f598ab412674ce5a78da98c54aa2fe2e4a05792

Merge branch 'master' into notes

Conflicts:
	Gemfile.lock
	app/views/diary_entry/list.html.erb
---