Merge remote-tracking branch 'upstream/master'
[youtube-dl] / youtube_dl / extractor / condenast.py
2013-07-17 Jaime Marquínez... Add CondeNastIE