Conflicts:

mediagoblin/auth/tools.py
	mediagoblin/auth/views.py
	mediagoblin/plugins/basic_auth/tools.py
This commit is contained in:
Rodney Ewing
2013-05-27 19:34:49 -07:00
parent b1e02e0a70
commit 0578d8b31b
59 changed files with 7525 additions and 5150 deletions