Merge branch 'master' into OPW-Moderation-Update
authortilly-Q <nattilypigeonfowl@gmail.com>
Tue, 20 Aug 2013 16:21:13 +0000 (12:21 -0400)
committertilly-Q <nattilypigeonfowl@gmail.com>
Tue, 20 Aug 2013 16:21:13 +0000 (12:21 -0400)
commit9e204e49c9670b0e004dc9b62bf3b698b7534325
tree452eab56add0e1b009b665f5b32d7b59b7545e82
parente1561d048815e29b3b7c7e1c860d9cf0c4326f0a
parentc62d174437445565b55b220396e7571a323a159c
Merge branch 'master' into OPW-Moderation-Update

Conflicts:
mediagoblin/db/models.py
mediagoblin/decorators.py
mediagoblin/routing.py
mediagoblin/user_pages/views.py
14 files changed:
mediagoblin/auth/views.py
mediagoblin/db/migrations.py
mediagoblin/db/models.py
mediagoblin/decorators.py
mediagoblin/routing.py
mediagoblin/static/css/base.css
mediagoblin/submit/views.py
mediagoblin/templates/mediagoblin/base.html
mediagoblin/templates/mediagoblin/user_pages/media.html
mediagoblin/tests/test_oauth2.py
mediagoblin/tools/response.py
mediagoblin/user_pages/forms.py
mediagoblin/user_pages/routing.py
mediagoblin/user_pages/views.py