From: Jaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>
Date: Thu, 25 Jul 2013 08:14:43 +0000 (-0700)
Subject: Merge pull request #1120 from pishposhmcgee/patch-1
X-Git-Url: https://git.cielonegro.org/gitweb.cgi?a=commitdiff_plain;h=733d9cacb859f3d3571ab68607d46c722454a32c;p=youtube-dl.git

Merge pull request #1120 from pishposhmcgee/patch-1

[collegehumor] Added an option 'e' to go with 'video' or 'embed'
---

733d9cacb859f3d3571ab68607d46c722454a32c