Merge branch 'next' into mongoid
authorDavid A. Cuadrado <krawek@gmail.com>
Tue, 9 Nov 2010 05:16:07 +0000 (00:16 -0500)
committerDavid A. Cuadrado <krawek@gmail.com>
Tue, 9 Nov 2010 05:16:07 +0000 (00:16 -0500)
commit6ea528eac00876730d6bf4489684694dacf3b7cd
treef8be1538f3a810b24f624de4b9b92a549f089306
parent5f548f31db8a1abc3ad68d5f0e527ccf78f138c1
parent74b81d57b635ae40973a2db28f5d4ad25a1c1640
Merge branch 'next' into mongoid

Conflicts:
app/models/widgets/badges_widget.rb
app/models/widgets/groups_widget.rb
app/models/widgets/pages_widget.rb
app/models/widgets/tag_cloud_widget.rb
app/models/widgets/top_groups_widget.rb
app/models/widgets/top_users_widget.rb
app/models/widgets/users_widget.rb
app/models/widgets/widget.rb
app/models/widgets/badges_widget.rb
app/models/widgets/groups_widget.rb
app/models/widgets/pages_widget.rb
app/models/widgets/tag_cloud_widget.rb
app/models/widgets/top_groups_widget.rb
app/models/widgets/top_users_widget.rb
app/models/widgets/users_widget.rb
app/models/widgets/widget.rb
app/views/questions/show.html.haml