From: pulpe <Pulpan3@gmail.com>
Date: Thu, 23 Apr 2015 09:43:37 +0000 (+0200)
Subject: Merge branch 'master' of github.com:rg3/youtube-dl
X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=c99f4098c4c94a3588e5f59c75dda58923c1c823;p=youtube-dl

Merge branch 'master' of github.com:rg3/youtube-dl
---

c99f4098c4c94a3588e5f59c75dda58923c1c823