Merge branch 'next' into next-ui
authorDavid A. Cuadrado <krawek@gmail.com>
Fri, 26 Nov 2010 06:20:38 +0000 (01:20 -0500)
committerDavid A. Cuadrado <krawek@gmail.com>
Fri, 26 Nov 2010 06:20:38 +0000 (01:20 -0500)
commit8e74574ed09c09a680a3e7d739b22ed13fd8d35a
treecc358fce03d19207907632d03225413a4b624563
parent9a49315509b7b18731114af3ad7a126c18586efb
parent6dbbf8f6404301147a1d99b37511b06c59bdd814
Merge branch 'next' into next-ui
app/controllers/users_controller.rb
config/routes.rb