Merge remote-tracking branch 'h-collector/master'
authorPhilipp Hagemeister <phihag@phihag.de>
Sun, 25 Jan 2015 02:37:51 +0000 (03:37 +0100)
committerPhilipp Hagemeister <phihag@phihag.de>
Sun, 25 Jan 2015 02:48:26 +0000 (03:48 +0100)
commit8940b8608e567dba09b3ea146b89b297190ec6d6
tree79d675e144e67efffa28b342f2b11eaab358dac1
parentec82d85acdc497436e7e2e767088d3ecb5947f68
parent5a000b45b339f6516f2a5a3bdfd2869713e8438a
Merge remote-tracking branch 'h-collector/master'

Conflicts:
youtube_dl/extractor/fc2.py
youtube_dl/extractor/fc2.py