Merge remote-tracking branch 'origin/next' into next-memberships
authorJorge H. Cuadrado <kuadrosxx@gmail.com>
Sun, 5 Jun 2011 18:42:38 +0000 (13:42 -0500)
committerJorge H. Cuadrado <kuadrosxx@gmail.com>
Sun, 5 Jun 2011 18:42:38 +0000 (13:42 -0500)
commit3312ed70e77f1bf603f681d6e0297a8d6e16a3c6
tree62c91baf16839ff0e99b6e6904c3d095bdba8049
parentfd7dd9e15c146385f61a5073d6410d9f0a2fe651
parent552e87550d1eeaf3900ec8b6605b05b6fc65283e
Merge remote-tracking branch 'origin/next' into next-memberships
Gemfile.lock
app/models/user.rb