Merge branch 'master' into 201207-testfixes

2012-07-08 11:07:02 -04:00
parent 9c7688667e a122357ee7
commit 81d3c4cf1c
24 changed files with 892 additions and 52 deletions
--- a/mediagoblin/media_types/audio/init.py
+++ b/mediagoblin/media_types/audio/init.py
@@ -22,4 +22,4 @@ MEDIA_MANAGER = {
    'processor': process_audio,
    'sniff_handler': sniff_handler,
    'display_template': 'mediagoblin/media_displays/audio.html',
-    'accepted_extensions': ['mp3', 'flac', 'ogg', 'wav', 'm4a']}
+    'accepted_extensions': ['mp3', 'flac', 'wav', 'm4a']}