Merge remote-tracking branch 'origin/next' into fixes-jc
authorJorge H. Cuadrado <kuadrosxx@gmail.com>
Thu, 26 May 2011 03:34:04 +0000 (22:34 -0500)
committerJorge H. Cuadrado <kuadrosxx@gmail.com>
Thu, 26 May 2011 03:34:04 +0000 (22:34 -0500)
commit6b5135109dc325564c2241f9b6280b79825154a8
treebd9747907d36b36828e689530e4098a8b635e099
parent8314eafd2cc4a1e327817456fe0c3acd1bbf356a
parentd023b75308b2f6629d9d7d4969fdf4e174bb2e57
Merge remote-tracking branch 'origin/next' into fixes-jc
app/controllers/users_controller.rb
app/helpers/application_helper.rb
app/models/user.rb
config/routes.rb