Merge branch 'master' into joar-skip_transcoding
authorChristopher Allan Webber <cwebber@dustycloud.org>
Fri, 1 Mar 2013 22:29:22 +0000 (16:29 -0600)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Fri, 1 Mar 2013 22:29:22 +0000 (16:29 -0600)
commited6344009abb31326acabe95449aaa449f66f4b4
tree03d65052d550b890074dde3c18857371be974f5c
parent5c754fdaeeddb1bbeff165bbecb77e33b75b3c7d
parentb7a3798e1806eb52a244088fb600376ff25e0de9
Merge branch 'master' into joar-skip_transcoding

Conflicts:
mediagoblin/config_spec.ini
mediagoblin/config_spec.ini
mediagoblin/media_types/video/processing.py
mediagoblin/media_types/video/transcoders.py