From: Philipp Hagemeister <phihag@phihag.de>
Date: Mon, 23 Dec 2013 03:37:40 +0000 (+0100)
Subject: Merge remote-tracking branch 'rzhxeo/youtube'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=youtube-dl;a=commitdiff_plain;h=f82b18efc1b8b58201362b6a1965b177cdc7da44

Merge remote-tracking branch 'rzhxeo/youtube'
---

f82b18efc1b8b58201362b6a1965b177cdc7da44