From: Philipp Hagemeister <phihag@phihag.de>
Date: Thu, 19 Apr 2012 07:44:25 +0000 (+0200)
Subject: Merge git://git.jankratochvil.net/youtube-dl
X-Git-Tag: 2012.09.27~20
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=29ce2c1201bef65a8c6bb20e631a9803fc4ae775;p=youtube-dl.git

Merge git://git.jankratochvil.net/youtube-dl
---

29ce2c1201bef65a8c6bb20e631a9803fc4ae775