Merge 14394:14533 from trunk.
authorTom Hughes <tom@compton.nu>
Thu, 16 Apr 2009 21:11:12 +0000 (21:11 +0000)
committerTom Hughes <tom@compton.nu>
Thu, 16 Apr 2009 21:11:12 +0000 (21:11 +0000)
commit5449cf4adcc1fad4b9f43426e6d3e4a8f65e6fbb
tree44b460ef0d803777c939206f8936c2281bcc489f
parenta4de927a2800e0fc739460cee5a71e58d09d25f9
parent80c6c685bcf097754e872ba61444fc4bb93f2515
Merge 14394:14533 from trunk.
16 files changed:
app/controllers/amf_controller.rb
app/controllers/api_controller.rb
app/controllers/application.rb
app/controllers/browse_controller.rb
app/controllers/diary_entry_controller.rb
app/controllers/message_controller.rb
app/controllers/node_controller.rb
app/controllers/old_node_controller.rb
app/controllers/old_way_controller.rb
app/controllers/relation_controller.rb
app/controllers/trace_controller.rb
app/controllers/user_controller.rb
app/controllers/way_controller.rb
app/views/layouts/site.rhtml
app/views/site/edit.rhtml
config/environment.rb