]> git.openstreetmap.org Git - rails.git/commitdiff
Correct merge issues in the last merge from master
authorKai Krueger <kakrueger@gmail.com>
Sat, 24 Apr 2010 12:14:54 +0000 (13:14 +0100)
committerÆvar Arnfjörð Bjarmason <avarab@gmail.com>
Sat, 24 Apr 2010 12:33:12 +0000 (12:33 +0000)

No differences found