Merge branch 'master' into openstreetbugs
authorTom Hughes <tom@compton.nu>
Sat, 13 Aug 2011 10:48:04 +0000 (11:48 +0100)
committerTom Hughes <tom@compton.nu>
Sat, 13 Aug 2011 10:48:04 +0000 (11:48 +0100)
commit72e33046c80bddc0ca9b1336786dcb4b349137f7
tree4d7c9272861632daf31669d2a82cb86c37a7e0b4
parent7c98b41cc89068d049a18f8738276f19cd47095e
parent9c1a3e47086b53592aafa9452a2a666d5c972f0d
Merge branch 'master' into openstreetbugs

Conflicts:
app/views/browse/_map.html.erb
app/views/site/index.html.erb
app/views/browse/_map.html.erb
app/views/site/index.html.erb
app/views/user/view.html.erb
config/example.application.yml
config/locales/de.yml
config/locales/en.yml
public/stylesheets/large.css