Merge branch 'prefer-webm' of ssh://github.com/rbrito/youtube-dl into prefer-webm
authorRogério Brito <rbrito@ime.usp.br>
Tue, 22 Feb 2011 00:59:23 +0000 (21:59 -0300)
committerRogério Brito <rbrito@ime.usp.br>
Tue, 22 Feb 2011 00:59:23 +0000 (21:59 -0300)

Trivial merge