From: Kai Krueger <kakrueger@gmail.com>
Date: Sat, 6 Feb 2010 13:13:52 +0000 (+0000)
Subject: merge 19601:19888 of rails_port into the openID branch
X-Git-Tag: live~6387
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/17a7c69e8dfefb5dda2a9f57d6ea3c879d4568f4

merge 19601:19888 of rails_port into the openID branch
---

17a7c69e8dfefb5dda2a9f57d6ea3c879d4568f4