Merge remote-tracking branch 'origin/next' into widgets
authorJorge H. Cuadrado <kuadrosxx@gmail.com>
Mon, 9 May 2011 02:13:30 +0000 (21:13 -0500)
committerJorge H. Cuadrado <kuadrosxx@gmail.com>
Mon, 9 May 2011 02:13:30 +0000 (21:13 -0500)
commit54d3783a05d8c1064c1ba86669d963e89356a3cd
tree0cbcdae866561d083fc197a061c4381bdd60164d
parentf7dad5487639ab2a7f9a5036a478ae8c686e9907
parent4ade6698df96b455f3e5dfbcd4fed27d55bc358d
Merge remote-tracking branch 'origin/next' into widgets

Conflicts:
app/models/widgets/top_groups_widget.rb
app/views/questions/show.html.haml