Merged 17047 from trunk.
authorTom Hughes <tom@compton.nu>
Tue, 13 Oct 2009 20:20:13 +0000 (20:20 +0000)
committerTom Hughes <tom@compton.nu>
Tue, 13 Oct 2009 20:20:13 +0000 (20:20 +0000)
1  2 
app/controllers/trace_controller.rb

Simple merge