Merge branch 'master' into openstreetbugs
authorTom Hughes <tom@compton.nu>
Wed, 20 Apr 2011 18:23:39 +0000 (19:23 +0100)
committerTom Hughes <tom@compton.nu>
Wed, 20 Apr 2011 18:23:39 +0000 (19:23 +0100)
commit8980da4381923d8099a11a1334baf3c3e625a484
tree1da6feec77b075baa13a3cb115cacc313e1db4db
parenta1cb0f04d476101116087286ff072d3a137355cb
parent658762a603a85b9387a024146c290dc40e08fd6b
Merge branch 'master' into openstreetbugs
app/controllers/browse_controller.rb
app/views/browse/_map.html.erb
app/views/site/index.html.erb
config/locales/en.yml