From: Philipp Hagemeister <phihag@phihag.de>
Date: Fri, 17 Jan 2014 02:02:55 +0000 (+0100)
Subject: Merge remote-tracking branch 'sahutd/master'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=youtube-dl;a=commitdiff_plain;h=82696d5d5dba6f202c423119f6ee350cff315eab

Merge remote-tracking branch 'sahutd/master'
---

82696d5d5dba6f202c423119f6ee350cff315eab