From: Philipp Hagemeister <phihag@phihag.de>
Date: Sun, 28 Aug 2011 21:23:42 +0000 (+0200)
Subject: Merge remote-tracking branch 'rbrito/prefer-webm'
X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=36cf7bccde454a0b11a0ab492ed58cd34ee9a6f2;p=youtube-dl

Merge remote-tracking branch 'rbrito/prefer-webm'
---

36cf7bccde454a0b11a0ab492ed58cd34ee9a6f2