Merge remote branch 'origin/next-specs' into next
authorDavid A. Cuadrado <krawek@gmail.com>
Sun, 14 Nov 2010 00:39:10 +0000 (19:39 -0500)
committerDavid A. Cuadrado <krawek@gmail.com>
Sun, 14 Nov 2010 00:39:10 +0000 (19:39 -0500)
commit2cb5eb5c4a9a95b865bf45ec8514ae5f04255a87
tree902ba658692800cd26388a91bb527df895fc3e27
parentb4278fb14d2dab7dd0168d36321c5c5c3114eb9b
parent65882aae6be03b071a718683acfea2db0280f42d
Merge remote branch 'origin/next-specs' into next

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