Merge remote-tracking branch 'origin/fix-connect' into next
authorDavid A. Cuadrado <krawek@gmail.com>
Wed, 18 May 2011 07:10:07 +0000 (02:10 -0500)
committerDavid A. Cuadrado <krawek@gmail.com>
Wed, 18 May 2011 07:10:07 +0000 (02:10 -0500)
commit818bf633f44c5777a023ea9c0c8315e1657ac06c
treea3ef69210594342f8bb03f2c47c5bd6f3d635ef6
parentec2ad6a35c730f40e31defedec63c1e18bb94d6d
parentf24c79d99fde6aaf3216853c401d8664dd189bc3
Merge remote-tracking branch 'origin/fix-connect' into next
app/controllers/users_controller.rb
config/deploy.rb