From: Philipp Hagemeister <phihag@phihag.de>
Date: Tue, 16 Sep 2014 21:33:26 +0000 (+0200)
Subject: Merge remote-tracking branch 'r4mos/master'
X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=727a98c3ee98c5112462415bb1abcab227373268;p=youtube-dl

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

727a98c3ee98c5112462415bb1abcab227373268