Merge pull request #866 from yasoob/master
authorFilippo Valsorda <filippo.valsorda@gmail.com>
Tue, 4 Jun 2013 17:39:31 +0000 (10:39 -0700)
committerFilippo Valsorda <filippo.valsorda@gmail.com>
Tue, 4 Jun 2013 17:39:31 +0000 (10:39 -0700)
Added support for XHamster - closes #841

1  2 
youtube_dl/InfoExtractors.py

Simple merge