Merge branch 'master' of git://git.openstreetmap.org/rails into openstreetbugs2
authorKai Krueger <kakrueger@gmail.com>
Sat, 30 Apr 2011 02:52:59 +0000 (20:52 -0600)
committerKai Krueger <kakrueger@gmail.com>
Sat, 30 Apr 2011 02:52:59 +0000 (20:52 -0600)

Trivial merge