From: Philipp Hagemeister <phihag@phihag.de>
Date: Tue, 22 May 2012 11:35:59 +0000 (-0700)
Subject: Merge pull request #342 from FiloSottile/master
X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=youtube-dl;a=commitdiff_plain;h=1b91a2e2cfa3b9277205eb9652e5a2f0b40a0016

Merge pull request #342 from FiloSottile/master

Re-organized code and a lot of other stuff.
---

1b91a2e2cfa3b9277205eb9652e5a2f0b40a0016