Merge remote-tracking branch 'joar/audio+sniffing'
authorJoar Wandborg <git@wandborg.com>
Tue, 27 Mar 2012 10:05:09 +0000 (12:05 +0200)
committerJoar Wandborg <git@wandborg.com>
Tue, 27 Mar 2012 10:05:09 +0000 (12:05 +0200)
commitdeea3f6661df68a62d56317915ca1e71240061d4
tree6b7708610db3500f07f494519d57eec7a0799eee
parentd0cb752992ce6cea2b8581dead5481591ddbb82b
parentc56d4b55a169d67a3e5e5aba4271a67f0cb79c6f
Merge remote-tracking branch 'joar/audio+sniffing'

Conflicts:
mediagoblin/media_types/image/processing.py
mediagoblin/media_types/video/__init__.py
mediagoblin/media_types/video/processing.py
mediagoblin/tests/test_submission.py
mediagoblin/config_spec.ini
mediagoblin/media_types/ascii/processing.py
mediagoblin/media_types/image/processing.py
mediagoblin/media_types/video/__init__.py
mediagoblin/media_types/video/processing.py
mediagoblin/processing/__init__.py
mediagoblin/static/js/audio.js
mediagoblin/static/js/geolocation-map.js
mediagoblin/submit/views.py
mediagoblin/tests/test_submission.py