apmon/openstreetmap-website — pull request #1 by jfirebaugh (2012-10-21 21:59:48+00:00)
Title: Merge with master

Resolved these conflicts:

### app/controllers/geocoder_controller.rb
Some methods had been removed on master.

### app/views/export/start.js.erb
This is moved to a plain .js file on master. The changes on your
branch don't appear necessary.

### app/views/layouts/site.html.erb
Updated Routing tab markup to match current code.

### app/views/site/_search.html.erb
This code now lives in index.js. I ported your changes over.

### app/views/site/index.html.erb
The JS in this file was moved to index.js. I kept your additions,
but you should move them to index.js as well.

### config/routes.rb
Spurious conflict.