Merge remote-tracking branch 'jnormore/vine_user'
authorPhilipp Hagemeister <phihag@phihag.de>
Tue, 13 May 2014 07:45:27 +0000 (09:45 +0200)
committerPhilipp Hagemeister <phihag@phihag.de>
Tue, 13 May 2014 07:45:27 +0000 (09:45 +0200)
1  2 
youtube_dl/extractor/__init__.py

Simple merge