Merge branch 'master' of http://10.200.0.3/GIT/videosite

diff --combined videosite/YouTubeGrabber.pm
index 72805bf,d333912..a7ed395
--- 1/videosite/YouTubeGrabber.pm
--- 2/videosite/YouTubeGrabber.pm
+++ b/videosite/YouTubeGrabber.pm
@@@ -35,7 -35,6 +35,7 @@@ my %videoformats = 
      22 => 'MP4/H264/AAC/720p',      # isommp42, High
      34 => 'FLV/H264/AAC/360p',      # Main
      35 => 'FLV/H264/AAC/480p',      # Main
 +    36 => '3GP/MPEG4-Visual/240p',
      37 => 'MP4/H264/AAC/1080p',     # High
      38 => 'MP4/H264/AAC/3072p',     # High
      43 => 'WebM/VP8/Vorbis/360p',   
@@@ -58,7 -57,7 +58,7 @@@ sub new 
      $self->{'NAME'} = 'youtube';
      $self->{_SELFTESTURL} = 'http://www.youtube.com/watch?v=dMH0bHeiRNg';
      $self->{_SELFTESTTITLE} = 'Evolution of Dance - By Judson Laipply';
-     $self->{'PATTERNS'} = ['(https?://(?:[-a-zA-Z0-9_.]+\.)*youtube\.(?:com|de|co.uk)/watch(?:_popup)?\?(?:.+=.+&|&)*v=([-a-zA-Z0-9_]+))',
+     $self->{'PATTERNS'} = ['(https?://(?:[-a-zA-Z0-9_.]+\.)*youtube\.(?:com|de|co.uk)/watch(?:_popup)?\?.*?v=([-a-zA-Z0-9_]+))',
                             '(https?://(?:[-a-zA-Z0-9_.]+\.)*youtube\.(?:com|de|co.uk)/watch\#\!v=([-a-zA-Z0-9_]+))',
                             '(https?://(?:[-a-zA-Z0-9_.]+\.)*youtube\.(?:com|de|co.uk)/v/([-a-zA-Z0-9_]+))',
                             '(https?://(?:[-a-zA-Z0-9_.]+\.)*youtube\.(?:com|de|co.uk)/user/[[:alnum:]]+\?v=([-a-zA-Z0-9_]+))',