Sebastian Spaeth a42dda21f9 Merge branch 'master' into upstream-master ...

Conflicts:
	mediagoblin/templates/mediagoblin/base.html
	mediagoblin/templates/mediagoblin/user_pages/user.html

2013-12-12 16:24:34 +01:00

..

__init__.py

Merge branch 'master' into upstream-master

2013-12-12 16:24:34 +01:00

task.py

Merge remote-tracking branch 'refs/remotes/rodney757/reprocessing'

2013-08-21 12:39:38 -05:00