From: Philipp Hagemeister <phihag@phihag.de>
Date: Sat, 6 Dec 2014 10:55:24 +0000 (+0100)
Subject: Merge remote-tracking branch 'cryptonaut/adultswim'
X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=f6735be4da1da24be3a2d90461069d192900838a;p=youtube-dl

Merge remote-tracking branch 'cryptonaut/adultswim'
---

f6735be4da1da24be3a2d90461069d192900838a