From: Kai Krueger <kakrueger@gmail.com>
Date: Sun, 2 May 2010 10:15:13 +0000 (+0100)
Subject: Merge branch 'master' of git://git.openstreetmap.org/rails into openID
X-Git-Tag: live~6364^2
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/9fbd888e04e545bf61789973b1ed5b457e2b1be9

Merge branch 'master' of git://git.openstreetmap.org/rails into openID
---

9fbd888e04e545bf61789973b1ed5b457e2b1be9