Merge tag 'upstream/2013.05.14'
[youtubedl] / bin / youtube-dl
2012-12-18 Rogério BritoMerge tag 'upstream/2012.12.11'
2012-12-18 Rogério BritoImported Upstream version 2012.12.11