From: Philipp Hagemeister <phihag@phihag.de>
Date: Mon, 2 Dec 2013 12:36:20 +0000 (+0100)
Subject: Merge branch 'master' of github.com:rg3/youtube-dl
X-Git-Url: https://git.cielonegro.org/gitweb.cgi?a=commitdiff_plain;h=a9be0cc736d63890413ced94ebb0d68a45730c97;p=youtube-dl.git

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

a9be0cc736d63890413ced94ebb0d68a45730c97