From: Philipp Hagemeister <phihag@phihag.de>
Date: Tue, 28 Oct 2014 08:13:23 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=68acdbda9d940da63a6e8c59e3292313cf07bdf5;p=youtube-dl

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

68acdbda9d940da63a6e8c59e3292313cf07bdf5