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)
commitf96252b913945a173ebf2388de0c01b401b90a3a
tree7548dfc2247efb507405b817f0223e517c4ced42
parent04b89c9026e14c16d3b53cbddf8654f354174245
parent6f600ff5d6bda54d8128e6263a468a08edfc3353
Merge remote-tracking branch 'upstream/master'
youtube_dl/__init__.py
youtube_dl/downloader/common.py