Merge branch 'rodney757-media_plugins'
authorChristopher Allan Webber <cwebber@dustycloud.org>
Fri, 12 Jul 2013 21:24:36 +0000 (16:24 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Fri, 12 Jul 2013 21:24:36 +0000 (16:24 -0500)
commit5305fee13b9f0a2b8f5ebe61f12c09c9cada3cca
tree7ffa78df3fbac665d32238d151fe76d07f4d995e
parentac08a9acaffbafdcb99506495a192b1eaa508544
parent4259ad5bf1680896090290e7327b49a053a8447b
Merge branch 'rodney757-media_plugins'

Conflicts:
mediagoblin.ini
mediagoblin/tests/test_mgoblin_app.ini
mediagoblin.ini
mediagoblin/app.py
mediagoblin/config_spec.ini
mediagoblin/gmg_commands/dbupdate.py
mediagoblin/media_types/pdf/processing.py
mediagoblin/tests/test_mgoblin_app.ini
mediagoblin/tests/test_submission.py