Merge remote branch 'origin/fix-find'
authorDavid A. Cuadrado <krawek@gmail.com>
Mon, 20 Sep 2010 22:38:55 +0000 (17:38 -0500)
committerDavid A. Cuadrado <krawek@gmail.com>
Mon, 20 Sep 2010 22:38:55 +0000 (17:38 -0500)
commit2990db550fb6525f2f037bd28f82d5d5efcc6790
tree317c8b03b3340f7bb03df8ed017ccaa4d82d04d7
parent2fcd996f178d320fa73cb4681f0f81c990433263
parentd2af7f0bca9995cc313d1c0ec0e4d7ca53c30a2d
Merge remote branch 'origin/fix-find'
app/controllers/answers_controller.rb
app/models/user.rb