From: Filippo Valsorda <filippo.valsorda@gmail.com>
Date: Thu, 15 Mar 2012 13:05:34 +0000 (+0100)
Subject: Merge branch 'master' of git://github.com/rg3/youtube-dl into closed-captions
X-Git-Tag: 2012.09.27~24
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=cfcf32d038441919932a9111b71e8060c12a96c6;p=youtube-dl.git

Merge branch 'master' of git://github.com/rg3/youtube-dl into closed-captions
---

cfcf32d038441919932a9111b71e8060c12a96c6