Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblin

mediagoblin/media_types/audio/__init__.py

@@ -19,6 +19,9 @@ from mediagoblin.media_types.audio.processing import process_audio, \
     sniff_handler
 from mediagoblin.tools import pluginapi
 
+# Why isn't .ogg in this list?  It's still detected, but via sniffing,
+# .ogg files could be either video or audio... sniffing determines which.
+
 ACCEPTED_EXTENSIONS = ["mp3", "flac", "wav", "m4a"]
 MEDIA_TYPE = 'mediagoblin.media_types.audio'
 

mediagoblin/tools/session.py

@@ -17,7 +17,7 @@
 import itsdangerous
 import logging
 
-import crypto
+from mediagoblin.tools import crypto
 
 _log = logging.getLogger(__name__)
 

setup.py

@@ -52,7 +52,7 @@ setup(
         'kombu==2.1.7',
         'jinja2',
         'sphinx',
-        'Babel',
+        'Babel<1.0',
         'argparse',
         'webtest<2',
         'ConfigObj',