Merge branch 'master' into openstreetbugs
authorTom Hughes <tom@compton.nu>
Mon, 6 Sep 2010 11:51:50 +0000 (12:51 +0100)
committerTom Hughes <tom@compton.nu>
Mon, 6 Sep 2010 11:51:50 +0000 (12:51 +0100)
commit6fb857020092c909043c4521b91a040f3bb16937
treedf13fe8a47be59e656a949cfa0d9a6dd8af6161a
parent52395b3cdf4d3cfae95730158edeeccf3d062a8e
parent6669253f9cec816fe42a195fe36e08af503a82c9
Merge branch 'master' into openstreetbugs

Conflicts:
config/environment.rb
config/routes.rb
app/views/site/index.html.erb
config/locales/en.yml
config/routes.rb
lib/map_boundary.rb
lib/osm.rb