Merge branch 'pre-auth' into basic_auth
authorRodney Ewing <ewing.rj@gmail.com>
Mon, 27 May 2013 15:25:22 +0000 (08:25 -0700)
committerRodney Ewing <ewing.rj@gmail.com>
Mon, 27 May 2013 15:25:22 +0000 (08:25 -0700)
commitbcd10ad6633d90b5feae4f5dec8cf5d5754d51b5
tree23dce33e5deaf33340f25d816ec309e39560d305
parentf339b76a4ee04571bd0a94d20a5d53d7f3d8d235
parent1d321f1c7158f3bd263d64ae703311e8d8e2a22a
Merge branch 'pre-auth' into basic_auth

Conflicts:
mediagoblin/auth/tools.py
mediagoblin/auth/views.py
mediagoblin/db/migrations.py
mediagoblin/plugins/basic_auth/lib.py
mediagoblin/plugins/httpapiauth/__init__.py
mediagoblin/plugins/piwigo/views.py
mediagoblin/auth/tools.py
mediagoblin/auth/views.py