Merge remote branch 'origin/next' into mongoid mongid-merged
authorJorge H. Cuadrado <kuadrosxx@gmail.com>
Sun, 7 Nov 2010 00:34:49 +0000 (19:34 -0500)
committerJorge H. Cuadrado <kuadrosxx@gmail.com>
Sun, 7 Nov 2010 00:34:49 +0000 (19:34 -0500)
commit89232ce71d7209700b87818355488c8be1d336d3
tree4e26a3779e93c783679c7fcdfac46875165e386d
parentd8911d81a0f0d09b022312734bfee39e9cab1a9d
parentf38665918162e542992684d1edf64607de793498
Merge remote branch 'origin/next' into mongoid

Conflicts:
app/models/answer.rb
app/models/comment.rb
app/models/question.rb
app/models/answer.rb
app/models/comment.rb
app/models/question.rb
app/models/vote.rb