Merge remote-tracking branch 'refs/remotes/rodney757/reprocessing'
authorChristopher Allan Webber <cwebber@dustycloud.org>
Wed, 18 Sep 2013 19:45:23 +0000 (14:45 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Wed, 18 Sep 2013 19:45:23 +0000 (14:45 -0500)
commit529eb17b38ac08c956164e8b829ea556db1f32f4
treeb7de91fdf85c8f2196f13a5ea199e908a41d7234
parent28eab59acef05b5f38052941483f900d2e78c50b
parentfd9e4af2721dd242382df8ddc0b5189fb521181c
Merge remote-tracking branch 'refs/remotes/rodney757/reprocessing'

Conflicts:
mediagoblin/db/migrations.py
mediagoblin/db/migrations.py
mediagoblin/db/models.py
mediagoblin/media_types/ascii/processing.py
mediagoblin/media_types/image/processing.py