From: Emilien Kenler <hello@emilienkenler.com>
Date: Sun, 18 Aug 2013 09:12:38 +0000 (+0200)
Subject: Merge branch 'master' into py-generator
X-Git-Url: https://git.cielonegro.org/gitweb.cgi?a=commitdiff_plain;h=12e895fc5a28d0cd9d93d74be5aeb055c48cfdd4;p=youtube-dl.git

Merge branch 'master' into py-generator
---

12e895fc5a28d0cd9d93d74be5aeb055c48cfdd4