Merge branch 'master' into next
authorDavid A. Cuadrado <krawek@gmail.com>
Sat, 6 Nov 2010 05:20:44 +0000 (00:20 -0500)
committerDavid A. Cuadrado <krawek@gmail.com>
Sat, 6 Nov 2010 05:20:44 +0000 (00:20 -0500)
commit2ad40a4a6ad6bbf726f9636214ca57a814e5e573
treeb756fb4c74ce319eeeb376f530ab55baa6dc8fbc
parent1eb544d1abdd919c6caa71fa4110f82daa2366d7
parent779f3c417f766aa82d0bf5ca71eb14c58f20ec83
Merge branch 'master' into next

Conflicts:
.gitignore
app/controllers/groups_controller.rb
app/helpers/application_helper.rb
app/models/notifier.rb
app/views/answers/show.html.haml
app/views/pages/show.html.haml
app/views/questions/show.html.haml
config/environments/production.rb
config/locales/groups/en.yml
public/javascripts/jsMath/easy/load.js
.gitignore
app/helpers/application_helper.rb
app/models/group.rb
app/views/questions/show.html.haml
config/locales/groups/en.yml
public/javascripts/jsMath/easy/load.js