Merge remote branch 'origin/next-specs' into next
authorDavid A. Cuadrado <krawek@gmail.com>
Sun, 19 Dec 2010 00:39:26 +0000 (19:39 -0500)
committerDavid A. Cuadrado <krawek@gmail.com>
Sun, 19 Dec 2010 00:39:26 +0000 (19:39 -0500)
commitd4faca800f2b851b8a5a9c2e07aa227c33ba3d6f
tree55261f7c5ce487227c815a9dcccd4c9c50e60a0d
parent1d3cc9b715de646842c8822fb3360227d4da51fa
parent50030632dbe419ac12f97b9d46b284b584b90b99
Merge remote branch 'origin/next-specs' into next
app/models/user.rb