Merge branch 'master' into openstreetbugs
authorTom Hughes <tom@compton.nu>
Mon, 7 Jun 2010 21:26:33 +0000 (22:26 +0100)
committerTom Hughes <tom@compton.nu>
Mon, 7 Jun 2010 21:26:33 +0000 (22:26 +0100)
commit50224b473bce736436d27c64bd46c1910e4d43ec
tree28f4dbbe0435618739b6fec0f1ca2a0a9aee2230
parent4b17b92da09820dd7bf61a640fd37458b82b06fe
parent406b46e49b786fab879286d77735b2a16c1cfcc5
Merge branch 'master' into openstreetbugs

Conflicts:
app/controllers/browse_controller.rb
app/controllers/browse_controller.rb
config/environment.rb
config/locales/en.yml