From: Rogério Brito <rbrito@ime.usp.br>
Date: Thu, 4 Aug 2011 20:44:49 +0000 (-0300)
Subject: Merge https://github.com/rg3/youtube-dl into vimeo
X-Git-Url: https://git.cielonegro.org/gitweb.cgi?a=commitdiff_plain;h=2fb47e073a1e0c676130ef0c62e9949dd40af8ed;p=youtube-dl.git

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

2fb47e073a1e0c676130ef0c62e9949dd40af8ed