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)
commit20a861392e1ee7970da5d95b546aa8551faaf27b
treee3953add98b0cd69052fe71580da734fd3ba0612
parentef40b61ff40881966ae4280cfdcb9f92965e9d10
parentcd8bb0dc577f2384a7b9732fb9ac9ec390fc8b19
Merge 17067 from trunk.
app/controllers/application_controller.rb