From: Tom Hughes <tom@compton.nu>
Date: Sun, 31 May 2009 11:32:32 +0000 (+0000)
Subject: Merge 15165:15373 from trunk.
X-Git-Tag: live~7366^2~30
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/3d906fe8c6303c00e399ce2dfecc3471959fbe6e?hp=3d906fe8c6303c00e399ce2dfecc3471959fbe6e

Merge 15165:15373 from trunk.
---