Merge pull request #1120 from pishposhmcgee/patch-1
authorJaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>
Thu, 25 Jul 2013 08:14:43 +0000 (01:14 -0700)
committerJaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>
Thu, 25 Jul 2013 08:14:43 +0000 (01:14 -0700)
[collegehumor] Added an option 'e' to go with 'video' or 'embed'


Trivial merge