Merge remote-tracking branch 'origin/master'
authorPhilipp Hagemeister <phihag@phihag.de>
Mon, 1 Sep 2014 21:13:49 +0000 (23:13 +0200)
committerPhilipp Hagemeister <phihag@phihag.de>
Mon, 1 Sep 2014 21:13:49 +0000 (23:13 +0200)
commita4446482027156c8221351d677bed8927d74e231
tree824d5ef46706389ade7802b6e0812b1da2f088f3
parent7ca2e11f24aa1b4232cb0ce9f9f33c98f76f3aa1
parent9b330db7f00bd6f4755507cc9f687958acdd2c87
Merge remote-tracking branch 'origin/master'

Conflicts:
youtube_dl/extractor/eporner.py
youtube_dl/extractor/hornbunny.py