From: Philipp Hagemeister Date: Tue, 13 Sep 2011 21:35:48 +0000 (+0200) Subject: Merge remote-tracking branch 'CaptainPatate/master' X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=34554a7ad4186ad5f39d1b9903b8b619bd77bba1;p=youtube-dl Merge remote-tracking branch 'CaptainPatate/master' --- 34554a7ad4186ad5f39d1b9903b8b619bd77bba1