Merge 7649:7673 from trunk.
authorTom Hughes <tom@compton.nu>
Sun, 4 May 2008 11:26:36 +0000 (11:26 +0000)
committerTom Hughes <tom@compton.nu>
Sun, 4 May 2008 11:26:36 +0000 (11:26 +0000)
1  2 
config/routes.rb

Simple merge