From: Kai Krueger <kakrueger@gmail.com>
Date: Sat, 30 Apr 2011 02:49:38 +0000 (-0600)
Subject: Merge branch 'openstreetbugs' of git://git.openstreetmap.org/rails into openstreetbugs2
X-Git-Tag: live~5111^2~184
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/a6f45adede24e47b113dcf0f33e701478076f1b7?ds=sidebyside

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

a6f45adede24e47b113dcf0f33e701478076f1b7