Merge remote-tracking branch 'origin/next-specs' into next
authorDavid A. Cuadrado <krawek@gmail.com>
Sat, 9 Apr 2011 05:08:55 +0000 (00:08 -0500)
committerDavid A. Cuadrado <krawek@gmail.com>
Sat, 9 Apr 2011 05:08:55 +0000 (00:08 -0500)
commit29f48f1f147252b1849e351c637f1ce8940d33d6
tree2db5f314b3a2aaa8c7b46af51372ace483ee42d0
parent119521007ef8fba68c5308149024830994eee329
parentfb161228ed536322518421cbc15868dbfd7a01e2
Merge remote-tracking branch 'origin/next-specs' into next

Conflicts:
lib/tasks/fixdb.rake
app/controllers/users_controller.rb
config/routes.rb
lib/tasks/fixdb.rake