From: Philipp Hagemeister <phihag@phihag.de>
Date: Thu, 11 Dec 2014 15:35:45 +0000 (+0100)
Subject: Merge remote-tracking branch 'akretz/master'
X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=cf68bcaeff77f5a5784c7c5473ce4fea0b8c73ae;p=youtube-dl

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

cf68bcaeff77f5a5784c7c5473ce4fea0b8c73ae