Merge branch 'video_gstreamer-only'
authorJoar Wandborg <git@wandborg.com>
Mon, 21 Nov 2011 20:51:30 +0000 (21:51 +0100)
committerJoar Wandborg <git@wandborg.com>
Mon, 21 Nov 2011 20:51:30 +0000 (21:51 +0100)
commitb9e1fa280edfff4daf424bbcf51bd651ed00f411
tree9f373c6443874bc5542115a79860da5957a1e182
parente56e5f8c5c3dc7909aa68a1543ed04ddb18e27f6
parentc875bb74a8245b39b6985f37cb8ab838c22efa7e
Merge branch 'video_gstreamer-only'

Conflicts:
mediagoblin/db/migrations.py
mediagoblin/submit/views.py
12 files changed:
mediagoblin/db/migrations.py
mediagoblin/gmg_commands/import_export.py
mediagoblin/init/celery/__init__.py
mediagoblin/process_media/__init__.py
mediagoblin/storage/cloudfiles.py
mediagoblin/submit/views.py
mediagoblin/templates/mediagoblin/base.html
mediagoblin/templates/mediagoblin/user_pages/media.html
mediagoblin/user_pages/views.py
mediagoblin/views.py
mediagoblin/workbench.py
setup.py