Merge remote-tracking branch 'origin/chosen'
authorDavid A. Cuadrado <krawek@gmail.com>
Sat, 3 Dec 2011 18:10:18 +0000 (13:10 -0500)
committerDavid A. Cuadrado <krawek@gmail.com>
Sat, 3 Dec 2011 18:10:18 +0000 (13:10 -0500)
commitc83edd909088de969833b51fbaf93ea1fc55bd65
tree8b8f1426ea9d14dbae284f12970357115ff12ab5
parent2ac762b8d790fc955713ee25985271dc1abac80b
parent4b362b1b03d17071e27d88e8b489aacbfc23a080
Merge remote-tracking branch 'origin/chosen'

Conflicts:
app/models/question.rb
app/models/question.rb