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)
commit7b384f03ab1d34fd3ebcc5ae3add25b3b5591e2e
tree9b5d2e664a5ae4d0e7e9d3dad9255673d8d7afb6
parent20a861392e1ee7970da5d95b546aa8551faaf27b
parent9617ca2accf5f00b75e5b7323bda435b6f596ea0
Merged 17047 from trunk.
app/controllers/trace_controller.rb