Merge branch 'master' of git://git.openstreetmap.org/rails
authorTom Hughes <tom@compton.nu>
Tue, 11 May 2010 18:45:48 +0000 (19:45 +0100)
committerTom Hughes <tom@compton.nu>
Tue, 11 May 2010 18:45:48 +0000 (19:45 +0100)
commit2e43a275de10e162d605df71e3e0f16ba596ad25
tree88028ca71f8902e8b08e6f4fdf1d361e5ef834e2
parent66221ba9b8e490ff2e863062dc38eefbaef374be
parent703c44eeab0ff078bf6a74887fbb1c94a50f80b3
Merge branch 'master' of git://git.openstreetmap.org/rails