Merge remote-tracking branch 'dstftw/generic-webpage-unescape'
authorJaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>
Fri, 21 Mar 2014 21:14:24 +0000 (22:14 +0100)
committerJaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>
Fri, 21 Mar 2014 21:14:24 +0000 (22:14 +0100)
commit0f2a2ba14b2cbf4bd8bec0ce32f8d7c27a733c68
treea7dbab5be496c91b5b4727e1a6052587f064ec82
parente24b5a861035c185eacc86a14967e67474235ca7
parentd95e35d659ea0dd2aa1dba3a4ee9925c25505fda
Merge remote-tracking branch 'dstftw/generic-webpage-unescape'

Conflicts:
youtube_dl/extractor/generic.py
youtube_dl/extractor/generic.py