From: Rogério Brito <rbrito@ime.usp.br>
Date: Tue, 22 Feb 2011 00:52:48 +0000 (-0300)
Subject: Merge branch 'vimeo' of ssh://github.com/rbrito/youtube-dl into vimeo
X-Git-Tag: 2011.09.13~30^2~8
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=1a3fe4212fc1480887431a0b83bcaafe27fd946c;p=youtube-dl.git

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

1a3fe4212fc1480887431a0b83bcaafe27fd946c