Merge remote-tracking branch 'origin/fabrication'
authorDavid A. Cuadrado <krawek@gmail.com>
Tue, 28 Feb 2012 06:56:16 +0000 (01:56 -0500)
committerDavid A. Cuadrado <krawek@gmail.com>
Tue, 28 Feb 2012 06:56:16 +0000 (01:56 -0500)
commit8ec6ace371ce56889a861ae235eded9a6ea98a79
tree49a0dd673d6fe8fe062572193e9d5a3ff01e847c
parent779e4d9a6a6d5f5d0cce78577df4dd78fb4ddaa7
parent1b8e17e4b6a7916c3cbc6cf3bfc5ff08b01cb08e
Merge remote-tracking branch 'origin/fabrication'

Conflicts:
Gemfile.lock
Gemfile
Gemfile.lock
app/models/answer.rb
app/models/question.rb
app/models/user.rb