From: Philipp Hagemeister <phihag@phihag.de>
Date: Mon, 16 Dec 2013 20:46:11 +0000 (+0100)
Subject: Merge branch 'master' of github.com:rg3/youtube-dl
X-Git-Tag: 2013.12.16.6~1
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=ff07a05575fb4686a06197faba753a7884f9af7b;p=youtube-dl.git

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

ff07a05575fb4686a06197faba753a7884f9af7b