From: Ricardo Garcia <sarbalap+freshmeat@gmail.com>
Date: Fri, 19 Nov 2010 17:30:58 +0000 (+0100)
Subject: Merge branch 'master' of https://github.com/psi-neamf/youtube-dl into psi-neamf
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=b04bb07c94675fb8c50a6dbdc79ee49643defa13;p=youtube-dl

Merge branch 'master' of https://github.com/psi-neamf/youtube-dl into psi-neamf
---

b04bb07c94675fb8c50a6dbdc79ee49643defa13
diff --cc youtube-dl
index 6a888cc3f,1a53c2c41..e164d5c8c
mode 100644,100755..100644
--- a/youtube-dl
+++ b/youtube-dl