Merge remote-tracking branch 'upstream/master'
authorPierre Rudloff <pierre@rudloff.pro>
Thu, 22 Aug 2013 10:52:05 +0000 (12:52 +0200)
committerPierre Rudloff <pierre@rudloff.pro>
Thu, 22 Aug 2013 10:52:05 +0000 (12:52 +0200)
commit8d212e604a86da3c924ab15fe8045ab748a8183d
tree5bc5588e5bbe7f8dad3fb1d0bbba354f2fb9e90c
parent943f7f7a399c6fb3006eb2bd68070f28a272171f
parent063fcc9676718fc4395b92d6e9665e7f3e9c8156
Merge remote-tracking branch 'upstream/master'

Conflicts:
youtube_dl/extractor/jeuxvideo.py
youtube_dl/extractor/jeuxvideo.py