Merge tag 'upstream/2013.12.04'

[youtubedl] / bin / youtube-dl

#!/usr/bin/env python

import youtube_dl

if __name__ == '__main__':
    youtube_dl.main()