Christopher Allan Webber 5305fee13b Merge branch 'rodney757-media_plugins'
Conflicts:
	mediagoblin.ini
	mediagoblin/tests/test_mgoblin_app.ini
2013-07-12 16:24:36 -05:00
..
2013-07-02 09:00:57 -07:00
2013-07-02 09:00:57 -07:00
2013-07-02 09:26:12 -07:00