Merge branch 'master' into openstreetbugs
authorTom Hughes <tom@compton.nu>
Thu, 5 Jan 2012 20:15:53 +0000 (20:15 +0000)
committerTom Hughes <tom@compton.nu>
Thu, 5 Jan 2012 20:15:53 +0000 (20:15 +0000)
commit52e5fa6ad78f375cec5a207a123a4aa3939c8ddf
treeee8211584ece7574357a0607f66834111d3b5a38
parent0030c7753740820fab12455dd841cd39c58b6475
parent294b098a0d3d0774e4caa39ff426a7a0f3bad53a
Merge branch 'master' into openstreetbugs

Conflicts:
app/views/browse/_map.html.erb
app/views/site/index.html.erb
config/initializers/mime_types.rb
config/routes.rb
lib/map_boundary.rb
lib/migrate.rb
lib/osm.rb
vendor/assets/openlayers/OpenLayers.js
19 files changed:
app/assets/stylesheets/common.css.scss
app/assets/stylesheets/large.css
app/controllers/browse_controller.rb
app/controllers/note_controller.rb
app/helpers/application_helper.rb
app/models/notifier.rb
app/views/browse/_map.html.erb
app/views/site/index.html.erb
app/views/user/view.html.erb
config/example.application.yml
config/initializers/mime_types.rb
config/locales/de.yml
config/locales/en.yml
config/openlayers.cfg
config/routes.rb
lib/bounding_box.rb
lib/geo_record.rb
lib/migrate.rb
vendor/assets/openlayers/OpenLayers.js