Merge remote-tracking branch 'refs/remotes/rodney757/reprocessing'
authorChristopher Allan Webber <cwebber@dustycloud.org>
Wed, 21 Aug 2013 17:39:31 +0000 (12:39 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Wed, 21 Aug 2013 17:39:38 +0000 (12:39 -0500)
commitf6497ce572c5dedb553a474023478625c5062a93
treeb74a161659c1fb9e776ff921b9e5e9fcedf15cd6
parentc62d174437445565b55b220396e7571a323a159c
parent9de4fab437558d101e801a02240ca3772c590ace
Merge remote-tracking branch 'refs/remotes/rodney757/reprocessing'

Conflicts:
mediagoblin/processing/task.py
mediagoblin/submit/lib.py
mediagoblin/processing/__init__.py
mediagoblin/processing/task.py
mediagoblin/submit/lib.py