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)
Conflicts:
youtube_dl/extractor/__init__.py


No differences found