Merge branch 'pre-auth' into basic_auth
authorRodney Ewing <ewing.rj@gmail.com>
Mon, 27 May 2013 16:04:53 +0000 (09:04 -0700)
committerRodney Ewing <ewing.rj@gmail.com>
Mon, 27 May 2013 16:04:53 +0000 (09:04 -0700)
commit0ccc722ddc2fabcd57b0a9b72d474feb5b312052
treee8abe3c17147d72e003eddcc7fb8847a25dbbddf
parent3b8c733b98533e6dd7612f071b672b19a97ecf1e
parentf855efff87c22ddb6b2a7ad690933de02ddfbc62
Merge branch 'pre-auth' into basic_auth

Conflicts:
mediagoblin/auth/tools.py
mediagoblin/auth/views.py
mediagoblin/plugins/basic_auth/tools.py
mediagoblin/auth/tools.py
mediagoblin/templates/mediagoblin/base.html