Merge remote-tracking branch 'upstream/master' into basic_auth
authorRodney Ewing <ewing.rj@gmail.com>
Tue, 28 May 2013 16:20:35 +0000 (09:20 -0700)
committerRodney Ewing <ewing.rj@gmail.com>
Tue, 28 May 2013 16:20:35 +0000 (09:20 -0700)
commitbd7fe0c25279541f93ccb71fe0261ebcd4e8d056
tree4434d00adad8da60249ee5f7afc294303e63474f
parentb85d9e9567984578ba549165edf721d67a83fa66
parentf9e032212dff4d54de644cb5537bc0bef6d24c7f
Merge remote-tracking branch 'upstream/master' into basic_auth

Conflicts:
mediagoblin/auth/tools.py
mediagoblin/auth/views.py
mediagoblin/plugins/basic_auth/tools.py
mediagoblin/auth/tools.py
mediagoblin/auth/views.py