Merge remote-tracking branch 'upstream/master'
authorrupertbaxter2 <rupertbaxter2@yahoo.com>
Wed, 13 Aug 2014 11:22:45 +0000 (04:22 -0700)
committerrupertbaxter2 <rupertbaxter2@yahoo.com>
Wed, 13 Aug 2014 11:22:45 +0000 (04:22 -0700)
1  2 
youtube_dl/__init__.py
youtube_dl/downloader/common.py

Simple merge
Simple merge