From: Rogério Brito <rbrito@ime.usp.br>
Date: Thu, 4 Aug 2011 20:44:33 +0000 (-0300)
Subject: Merge https://github.com/rg3/youtube-dl into prefer-webm
X-Git-Tag: 2011.09.13~27^2
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=05b4029662d3ed2c778dffc24bf33f27434c2ce1;p=youtube-dl.git

Merge https://github.com/rg3/youtube-dl into prefer-webm
---

05b4029662d3ed2c778dffc24bf33f27434c2ce1