From: Rogério Brito <rbrito@ime.usp.br>
Date: Fri, 25 Feb 2011 23:08:33 +0000 (-0300)
Subject: Merge branch 'master' into prefer-webm
X-Git-Tag: 2011.09.13~27^2~3
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=854cad639eb15241fac85799277d49a94a83a099;p=youtube-dl.git

Merge branch 'master' into prefer-webm
---

854cad639eb15241fac85799277d49a94a83a099