From: Philipp Hagemeister <phihag@phihag.de>
Date: Sat, 13 Dec 2014 22:05:41 +0000 (+0100)
Subject: Merge remote-tracking branch 'fstirlitz/master'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=youtube-dl;a=commitdiff_plain;h=d5524947b560c1d0e1dfa2ef7f1969efe07866fa

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

d5524947b560c1d0e1dfa2ef7f1969efe07866fa