Merge remote branch 'upstream/next-members' into ui
authordgfrancisco <dgfranciscorodriguez@gmail.com>
Thu, 2 Jun 2011 04:24:39 +0000 (23:24 -0500)
committerdgfrancisco <dgfranciscorodriguez@gmail.com>
Thu, 2 Jun 2011 04:24:39 +0000 (23:24 -0500)
commitc38fa44807723c2df5c3495d7359e0242d20ab7e
tree47abe18c7f3061da2bd210f1d5a38f931d168a44
parent1e46922b0f38afb93785b8b067935c8756eb2d99
parent5d198179f79fdeef06692ae4b296790b53a808a1
Merge remote branch 'upstream/next-members' into ui
Gemfile.lock
app/models/user.rb