From: Matt Amos <zerebubuth@gmail.com>
Date: Fri, 2 Oct 2009 15:36:46 +0000 (+0000)
Subject: Merging 17905:17944 from trunk.
X-Git-Tag: live~7197^2~2
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/17f05fdb13cab3fc2f430c54ec7ad6557c53eeeb

Merging 17905:17944 from trunk.
---

17f05fdb13cab3fc2f430c54ec7ad6557c53eeeb