From: Rogério Brito <rbrito@ime.usp.br>
Date: Tue, 22 Feb 2011 00:59:23 +0000 (-0300)
Subject: Merge branch 'prefer-webm' of ssh://github.com/rbrito/youtube-dl into prefer-webm
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=3b84a43076615f84da2ffe1ac9c0691ef048e395;p=youtube-dl

Merge branch 'prefer-webm' of ssh://github.com/rbrito/youtube-dl into prefer-webm
---

3b84a43076615f84da2ffe1ac9c0691ef048e395