From: Philipp Hagemeister <phihag@phihag.de>
Date: Thu, 11 Dec 2014 15:28:10 +0000 (+0100)
Subject: Merge remote-tracking branch 'akretz/youtube_fix'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=9684f17cdef0b36f1c20683192d1604518c012e6;p=youtube-dl

Merge remote-tracking branch 'akretz/youtube_fix'
---

9684f17cdef0b36f1c20683192d1604518c012e6