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)
commit960d13488a875245570ee498ee9a1ed7cac37bbe
treeabc5a2feb736d648c2a02f6badefb07bae5fe106
parentf053c8472336b386eaff72acdcdb8f8e148a3340
parent2cf15b549e985f090648b449ca660b6d6e264f50
Merge 7922:8377 from trunk.
app/views/site/index.rhtml
config/routes.rb
public/javascripts/map.js