From: Rogério Brito <rbrito@ime.usp.br>
Date: Thu, 21 Apr 2011 00:00:46 +0000 (-0300)
Subject: Merge branch 'master' into vimeo
X-Git-Tag: 2011.09.13~30^2~5
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=00f3977f774e14ea77ecfdcf9d2e6f3b4ef88fd5;p=youtube-dl.git

Merge branch 'master' into vimeo
---

00f3977f774e14ea77ecfdcf9d2e6f3b4ef88fd5