Tom Hughes 0d3a9ed9cb Merge branch 'master' into openstreetbugs ... Conflicts: Gemfile.lock app/views/browse/_map.html.erb app/views/user/view.html.erb config/locales/en.yml config/openlayers.cfg db/structure.sql vendor/assets/openlayers/OpenLayers.js		2012-08-22 20:52:08 +01:00
..
assets	Merge branch 'master' into openstreetbugs	2012-08-22 20:52:08 +01:00
controllers	Merge branch 'master' into openstreetbugs	2012-08-22 20:52:08 +01:00
helpers	Merge branch 'master' into openstreetbugs	2012-08-22 20:52:08 +01:00
models	Merge branch 'master' into openstreetbugs	2012-08-22 20:52:08 +01:00
views	Merge branch 'master' into openstreetbugs	2012-08-22 20:52:08 +01:00