Merge oauth branch at r17138 to trunk.
authorTom Hughes <tom@compton.nu>
Tue, 18 Aug 2009 20:01:56 +0000 (20:01 +0000)
committerTom Hughes <tom@compton.nu>
Tue, 18 Aug 2009 20:01:56 +0000 (20:01 +0000)
1  2 
app/controllers/application_controller.rb
app/controllers/trace_controller.rb

Simple merge