Merge remote-tracking branch 'is_derek/bug405_email_notifications_for_comments' into...
authorJoar Wandborg <git@wandborg.com>
Sun, 10 Jun 2012 13:53:46 +0000 (15:53 +0200)
committerJoar Wandborg <git@wandborg.com>
Sun, 10 Jun 2012 13:53:46 +0000 (15:53 +0200)
commit879ff4bde6afaee8bf5bdc2a0e659d66e767d424
tree71c9031f785f490f82d2fb7360b72b0f6007e2fe
parenta855e92a985a9bdc9c5062cad268eba3d8e19f84
parentfa72e516897a370b1e47e5f0ff17155990cd2414
Merge remote-tracking branch 'is_derek/bug405_email_notifications_for_comments' into notifications-merge

Conflicts:
mediagoblin/db/mongo/migrations.py
mediagoblin/db/mongo/migrations.py
mediagoblin/db/sql/models.py
mediagoblin/edit/forms.py
mediagoblin/edit/views.py
mediagoblin/user_pages/views.py