Merge remote-tracking branch 'dstftw/escape-non-ascii-in-urls'
authorPhilipp Hagemeister <phihag@phihag.de>
Mon, 15 Sep 2014 13:40:10 +0000 (15:40 +0200)
committerPhilipp Hagemeister <phihag@phihag.de>
Mon, 15 Sep 2014 13:40:10 +0000 (15:40 +0200)
commit0003a5c4163df6b5a7fd90ec256ea7497f639dda
treeda39efa0f5db04075cb91999bb901199f2725bb7
parent21f2927f707dc1dfe9182a290571da1714f1ed63
parent984e8e14ea266d406c253098f953e727ca8c19c7
Merge remote-tracking branch 'dstftw/escape-non-ascii-in-urls'

Conflicts:
test/test_utils.py
test/test_utils.py
youtube_dl/utils.py