Merge remote-tracking branch 'origin/master' into networks
authorJorge H. Cuadrado <kuadrosxx@gmail.com>
Thu, 30 Jun 2011 21:44:04 +0000 (16:44 -0500)
committerJorge H. Cuadrado <kuadrosxx@gmail.com>
Thu, 30 Jun 2011 21:44:04 +0000 (16:44 -0500)
commitb173196b9b5d8f414252c042962960bf10ca2bde
tree09e6f1018e81181c15fd20f1184316f208d8777d
parentf4ded364fe016ffc318c8544035b53bf6f8d2f97
parent437e307e8f5dea9035e6e4949fbe795f30752829
Merge remote-tracking branch 'origin/master' into networks

Conflicts:
Gemfile.lock
Gemfile.lock
app/controllers/users_controller.rb
app/models/user.rb