Merge remote-tracking branch 'epitron/metadata-pp'
authorPhilipp Hagemeister <phihag@phihag.de>
Tue, 7 Jan 2014 04:44:44 +0000 (05:44 +0100)
committerPhilipp Hagemeister <phihag@phihag.de>
Tue, 7 Jan 2014 04:44:44 +0000 (05:44 +0100)
commit5f263296eaa72ddca232d734a2625bcd85771908
tree20be6ebdfb0b1f36c789c7f0cf86f70b0a5c2e69
parent89650ea3a680a383d7e6129e9c11b129a23e9150
parente63fc1bed423e7b84e257000d7d25bb812d37685
Merge remote-tracking branch 'epitron/metadata-pp'

Conflicts:
youtube_dl/PostProcessor.py
README.md
youtube_dl/PostProcessor.py
youtube_dl/__init__.py
youtube_dl/utils.py