From: Philipp Hagemeister <phihag@phihag.de>
Date: Sun, 19 Jan 2014 05:12:20 +0000 (+0100)
Subject: Merge remote-tracking branch 'sahutd/master'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=b27bec212faa0e0d17faa09ee3b88919397abd55;p=youtube-dl

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

b27bec212faa0e0d17faa09ee3b88919397abd55