From: Thomas Wood <grand.edgemaster@gmail.com>
Date: Fri, 19 Jun 2009 22:53:16 +0000 (+0000)
Subject: merge 15807:16012 from rails_port
X-Git-Tag: live~6892^2~17
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/ff03138a978406b431da71aba64941d87b509098?hp=ff03138a978406b431da71aba64941d87b509098;ds=sidebyside

merge 15807:16012 from rails_port
---