From: Philipp Hagemeister <phihag@phihag.de>
Date: Thu, 8 Dec 2011 19:39:22 +0000 (+0100)
Subject: Merge branch 'master' of github.com:rg3/youtube-dl
X-Git-Url: http://git.jankratochvil.net/?p=youtube-dl.git;a=commitdiff_plain;h=a05d2a0c05b553bf2f5dec78aade0bf4733e9852;hp=0b14e0b367f1ee280fc97e853922758b07d2c742

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

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..95401e0
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+*.pyc
+*.pyo
+*~