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)
commit3b84a43076615f84da2ffe1ac9c0691ef048e395
treeefdef0cf5298346fda5393298d5beb47f36ed4ca
parent2c8bedd12c3e9b7c1771ec94c1f0115dc49485fa
parenta4a590b5b1619d32b5b3a0d7a099ece597aa7136
Merge branch 'prefer-webm' of ssh://github.com/rbrito/youtube-dl into prefer-webm