From: Tom Hughes <tom@compton.nu>
Date: Thu, 16 Apr 2009 21:11:12 +0000 (+0000)
Subject: Merge 14394:14533 from trunk.
X-Git-Tag: live~8665^2~10
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/5449cf4adcc1fad4b9f43426e6d3e4a8f65e6fbb?ds=inline;hp=5449cf4adcc1fad4b9f43426e6d3e4a8f65e6fbb

Merge 14394:14533 from trunk.
---