From: Kai Krueger <kakrueger@gmail.com>
Date: Sat, 30 Apr 2011 02:52:59 +0000 (-0600)
Subject: Merge branch 'master' of git://git.openstreetmap.org/rails into openstreetbugs2
X-Git-Tag: live~5068^2~183
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/43e12e7d02307ad92cc51ebd09f4e88a466168aa

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

43e12e7d02307ad92cc51ebd09f4e88a466168aa