Merge remote-tracking branch 'gitprojs/master'
authorPhilipp Hagemeister <phihag@phihag.de>
Thu, 27 Jun 2013 16:16:41 +0000 (18:16 +0200)
committerPhilipp Hagemeister <phihag@phihag.de>
Thu, 27 Jun 2013 16:16:41 +0000 (18:16 +0200)
commit3a8736bd745ecd7ce5cb605cf56710f76a26d1ab
tree38d64cb3a0dff9f56ae110adbc2254639cd7704f
parentc8c516361819f0e01dbff33a0fcb97e9f0e25386
parente4decf2750ee3b0cfdb6c866a1496d0dd96914fa
Merge remote-tracking branch 'gitprojs/master'

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