Merge branch 'master' into openstreetbugs2
authorKai Krueger <kakrueger@gmail.com>
Wed, 20 Apr 2011 04:00:30 +0000 (22:00 -0600)
committerKai Krueger <kakrueger@gmail.com>
Wed, 20 Apr 2011 04:00:30 +0000 (22:00 -0600)
commit001ff5764bcf15aaa179dc5c7844038676536622
treefbae934bfd6311ef20cf451321094f58888439d8
parenta1cb0f04d476101116087286ff072d3a137355cb
parent7a8d021dc8fe38b7050c09c26b184d6d0748096a
Merge branch 'master' into openstreetbugs2
app/controllers/browse_controller.rb
app/views/browse/_map.html.erb
app/views/site/index.html.erb
config/locales/en.yml