From: Philipp Hagemeister <phihag@phihag.de>
Date: Fri, 12 Dec 2014 19:17:26 +0000 (+0100)
Subject: Merge remote-tracking branch 'fstirlitz/master'
X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=46d9760f5ebd86ee5b34fd669f44b124f34fffc1;p=youtube-dl

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

46d9760f5ebd86ee5b34fd669f44b124f34fffc1