Merge branch 'vimeo' of https://github.com/rbrito/youtube-dl
authorPhilipp Hagemeister <phihag@phihag.de>
Tue, 18 Oct 2011 22:38:41 +0000 (00:38 +0200)
committerPhilipp Hagemeister <phihag@phihag.de>
Tue, 18 Oct 2011 22:38:41 +0000 (00:38 +0200)

Trivial merge