From: Philipp Hagemeister <phihag@phihag.de>
Date: Tue, 27 Aug 2013 00:00:23 +0000 (+0200)
Subject: Merge branch 'master' of github.com:rg3/youtube-dl
X-Git-Tag: 2013.08.27~1
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=65883c8dbdb0241c42a18f0502b0d5103cff72bc;p=youtube-dl.git

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

65883c8dbdb0241c42a18f0502b0d5103cff72bc