Merge remote-tracking branch 'refs/remotes/tilly-q/OPW-Moderation-Update'
authorChristopher Allan Webber <cwebber@dustycloud.org>
Mon, 7 Oct 2013 20:48:33 +0000 (15:48 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Mon, 7 Oct 2013 20:48:33 +0000 (15:48 -0500)
commit56c4ad89ebef32bd5a40c00d987811ce4501ce22
tree7523b2b274ce512093aed3914520275c80fe7e8f
parent345b958871c48df56b8d1acf9516bb9780aa6701
parent0a24db84c5769149537b0d9bd8e3a88fe8e9522a
Merge remote-tracking branch 'refs/remotes/tilly-q/OPW-Moderation-Update'

Conflicts:
mediagoblin/templates/mediagoblin/user_pages/user.html
mediagoblin/tests/test_auth.py
mediagoblin/tests/test_submission.py
15 files changed:
mediagoblin/auth/tools.py
mediagoblin/auth/views.py
mediagoblin/config_spec.ini
mediagoblin/db/migrations.py
mediagoblin/db/models.py
mediagoblin/edit/views.py
mediagoblin/submit/views.py
mediagoblin/templates/mediagoblin/user_pages/user.html
mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html
mediagoblin/tests/test_auth.py
mediagoblin/tests/test_edit.py
mediagoblin/tests/test_openid.py
mediagoblin/tests/test_persona.py
mediagoblin/tests/test_submission.py
mediagoblin/user_pages/views.py