Merge remote-tracking branch 'upstream/master' into auth
authorRodney Ewing <ewing.rj@gmail.com>
Tue, 25 Jun 2013 20:37:21 +0000 (13:37 -0700)
committerRodney Ewing <ewing.rj@gmail.com>
Tue, 25 Jun 2013 20:37:21 +0000 (13:37 -0700)
commitaf4414a85f3354a432e29ecf8cf39ffd926371e3
tree34da18957bceb784aff8cd5c413fa8e8273068e9
parent5a1be074c0522c2151ab735eeb30a60c07ff7f7c
parent7fa4e19fc4e7d04175549ea2f21f8b741fbe69f2
Merge remote-tracking branch 'upstream/master' into auth

Conflicts:
mediagoblin/app.py
mediagoblin/auth/forms.py
mediagoblin/auth/tools.py
mediagoblin/db/migrations.py
mediagoblin/db/models.py
mediagoblin/edit/views.py
mediagoblin/plugins/basic_auth/tools.py
mediagoblin/tests/test_edit.py
13 files changed:
mediagoblin.ini
mediagoblin/app.py
mediagoblin/auth/forms.py
mediagoblin/auth/tools.py
mediagoblin/auth/views.py
mediagoblin/db/migrations.py
mediagoblin/db/models.py
mediagoblin/edit/views.py
mediagoblin/plugins/basic_auth/__init__.py
mediagoblin/templates/mediagoblin/base.html
mediagoblin/tests/test_auth.py
mediagoblin/tests/test_edit.py
mediagoblin/tests/tools.py