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: https://git.cielonegro.org/gitweb.cgi?a=commitdiff_plain;h=82696d5d5dba6f202c423119f6ee350cff315eab;p=youtube-dl.git

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

82696d5d5dba6f202c423119f6ee350cff315eab