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)
commitd227589a6336999c38bffc5e11655100b9a4630a
tree622c38f91ba3b17cecc8de8ddab0372a64aae30b
parent803acea03227f560776bf49621d9525ff40cba2f
parent1eb58bc6078129b0f4e2127ff77f8180674bd67f
Merge oauth branch at r17138 to trunk.
app/controllers/application_controller.rb
app/controllers/trace_controller.rb