From: Petr Půlpán <Pulpan3@gmail.com>
Date: Wed, 25 Jun 2014 15:45:24 +0000 (+0200)
Subject: Merge branch 'master' of github.com:rg3/youtube-dl
X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=2f775107f90b8b28d1854feacdc02248b0d03150;p=youtube-dl

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

2f775107f90b8b28d1854feacdc02248b0d03150