Merge remote-tracking branch 'pulpe/teachertube'
authorPhilipp Hagemeister <phihag@phihag.de>
Sat, 7 Jun 2014 13:20:12 +0000 (15:20 +0200)
committerPhilipp Hagemeister <phihag@phihag.de>
Sat, 7 Jun 2014 13:20:12 +0000 (15:20 +0200)
commit24f5251cce172f0e403b4178819dd26b3873f021
treed7748f7af049920740a58ac7b53ecef283a2d5bb
parentac1390eee838d35b76d356e4e68bd430843d3439
parentb4e7447458770a705c064d0eb7f73f49dc885557
Merge remote-tracking branch 'pulpe/teachertube'

Conflicts:
youtube_dl/extractor/__init__.py
youtube_dl/extractor/__init__.py