From: Philipp Hagemeister <phihag@phihag.de>
Date: Sun, 20 Jul 2014 16:32:59 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=youtube-dl;a=commitdiff_plain;h=71a6eaff83636415f9a0f985bf6e4b35b859ab54

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

71a6eaff83636415f9a0f985bf6e4b35b859ab54