Merge remote-tracking branch 'upstream/master'
authorPierre Rudloff <pierre@rudloff.pro>
Thu, 22 Aug 2013 10:55:58 +0000 (12:55 +0200)
committerPierre Rudloff <pierre@rudloff.pro>
Thu, 22 Aug 2013 10:55:58 +0000 (12:55 +0200)
commit05a2926c5c7737e6f17ccf96a35a01ec05fe092b
tree0f63da5f6cb2756f11cadb16de42786428b3daff
parent7070b83687ed134af6d9a71bbf2ec759a56965d5
Merge remote-tracking branch 'upstream/master'
youtube-dl