Rodney Ewing af4414a85f 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
2013-06-25 13:37:21 -07:00
..
2013-06-21 14:14:40 -07:00
2013-04-15 09:51:21 +03:00
2012-02-02 09:44:13 -06:00
2013-05-27 08:43:12 -07:00
2013-06-09 21:18:37 +02:00
2013-05-20 00:11:00 +02:00
2013-06-09 21:18:37 +02:00
2013-04-25 14:31:29 +02:00