Merge 7922:8377 from trunk.
authorTom Hughes <tom@compton.nu>
Sun, 22 Jun 2008 12:23:43 +0000 (12:23 +0000)
committerTom Hughes <tom@compton.nu>
Sun, 22 Jun 2008 12:23:43 +0000 (12:23 +0000)
1  2 
app/views/site/index.rhtml
config/routes.rb
public/javascripts/map.js

Simple merge
Simple merge
Simple merge