Merge remote-tracking branch 'origin/xapian' into xapian
authorJorge H. Cuadrado <kuadrosxx@gmail.com>
Thu, 29 Sep 2011 22:41:53 +0000 (17:41 -0500)
committerJorge H. Cuadrado <kuadrosxx@gmail.com>
Thu, 29 Sep 2011 22:41:53 +0000 (17:41 -0500)
commitd25e09e43352321d5609dfb09ac337e22c6513d1
treeb77d65ffb8d76f019902dbf2f4ae482c0257af77
parent0cf55c4374d9eaa796b7b31fb4a30f10c77de995
parentc809f4eb104f67aafa2e6fea4bbe71855088b325
Merge remote-tracking branch 'origin/xapian' into xapian

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