Merge changes from trunk 7673:8632.
authorShaun McDonald <shaun@shaunmcdonald.me.uk>
Thu, 3 Jul 2008 13:06:24 +0000 (13:06 +0000)
committerShaun McDonald <shaun@shaunmcdonald.me.uk>
Thu, 3 Jul 2008 13:06:24 +0000 (13:06 +0000)
commit5f8ab9e9244550b20b8d3bd97b3567df7020d06d
tree89e7bd19c2af75ba260225e8382340165c81da44
parent0a459023d313ee16f8901da92058c0c2a4b8b9e9
parent08d1f5aaab193054c465ebda62ae82d97a1125be
Merge changes from trunk 7673:8632.
app/controllers/api_controller.rb
app/controllers/application.rb
app/models/old_relation.rb
app/models/old_way.rb
app/models/relation.rb
app/models/way.rb
config/environment.rb
config/routes.rb