Merge remote-tracking branch 'tobidope/gameone'
authorPhilipp Hagemeister <phihag@phihag.de>
Fri, 11 Jul 2014 09:17:57 +0000 (11:17 +0200)
committerPhilipp Hagemeister <phihag@phihag.de>
Fri, 11 Jul 2014 09:17:57 +0000 (11:17 +0200)
1  2 
youtube_dl/extractor/__init__.py
youtube_dl/utils.py

Simple merge
Simple merge