Merge 17067 from trunk.
authorTom Hughes <tom@compton.nu>
Tue, 13 Oct 2009 20:16:03 +0000 (20:16 +0000)
committerTom Hughes <tom@compton.nu>
Tue, 13 Oct 2009 20:16:03 +0000 (20:16 +0000)
1  2 
app/controllers/application_controller.rb