Merge remote-tracking branch 'origin/next' into fixes-jc
authorJorge H. Cuadrado <kuadrosxx@gmail.com>
Sun, 29 May 2011 20:07:57 +0000 (15:07 -0500)
committerJorge H. Cuadrado <kuadrosxx@gmail.com>
Sun, 29 May 2011 20:07:57 +0000 (15:07 -0500)
commitdd80df00dc38f98803d996f2bb2d28434b8db0d7
treebef549c358fada008933d33aa31ed0373c7652e7
parent9d310a8e73193bbbacc880f443e17742fcba9a16
parent7fe5406ccb0edb7c985f75dc0fe6c736326fabe2
Merge remote-tracking branch 'origin/next' into fixes-jc
config/routes.rb