From: Filippo Valsorda <filippo.valsorda@gmail.com>
Date: Wed, 6 Jun 2012 18:46:37 +0000 (+0200)
Subject: Merge pull requests #356 #357 #358 by jcarlosgarciasegovia
X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=3187e42a23a0bb68799935ed7acc7667e7dfe5c3;p=youtube-dl

Merge pull requests #356 #357 #358 by jcarlosgarciasegovia
---

3187e42a23a0bb68799935ed7acc7667e7dfe5c3