From: Petr Půlpán <Pulpan3@gmail.com>
Date: Sun, 29 Jun 2014 14:44:37 +0000 (+0200)
Subject: Merge branch 'master' of github.com:rg3/youtube-dl
X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=825cdcec3c8a2ef8677ae60b57fe7fe6b936f473;p=youtube-dl

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

825cdcec3c8a2ef8677ae60b57fe7fe6b936f473