Merge remote-tracking branch 'naglis/sockshare'
authorPhilipp Hagemeister <phihag@phihag.de>
Mon, 21 Jul 2014 11:24:15 +0000 (13:24 +0200)
committerPhilipp Hagemeister <phihag@phihag.de>
Mon, 21 Jul 2014 11:24:15 +0000 (13:24 +0200)
commit7dabd2ac45a53bc608390a72c2d43044aaf6efb8
treef751fe30d00eb642fab452308f4ef3600764f9d2
parentdf8ba0d2cf9ea0ae1fde4c9f76a12f315e88aef3
parent66aa382eae9342506db64ce3328a009fd3f06d5c
Merge remote-tracking branch 'naglis/sockshare'

Conflicts:
youtube_dl/extractor/__init__.py
youtube_dl/extractor/__init__.py