From: Jeff Crouse <jefftimesten@gmail.com>
Date: Sat, 5 Jan 2013 21:01:03 +0000 (-0500)
Subject: Merge branch 'master' of https://github.com/jefftimesten/youtube-dl
X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=youtube-dl;a=commitdiff_plain;h=7e7ab2815cc86285f0c768517ec07877b92b0133

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

7e7ab2815cc86285f0c768517ec07877b92b0133