Merge branch 'master' into derek-moore-bug405_email_notifications_for_comments
authorChristopher Allan Webber <cwebber@dustycloud.org>
Sun, 18 Mar 2012 17:12:41 +0000 (12:12 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Sun, 18 Mar 2012 17:12:41 +0000 (12:12 -0500)
commit94e605237512daa518bcab9b59edbc1107840006
treeeb1aa0b714c536f68474f0853c251ed4c5d683cf
parentbf0f67ad6547e2073770942ddf66f23d3181831a
parent54477b4d76ca983e2e884fea9c0975c7e63fdc1d
Merge branch 'master' into derek-moore-bug405_email_notifications_for_comments

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