From: Rogério Brito <rbrito@ime.usp.br>
Date: Fri, 4 Oct 2013 12:25:46 +0000 (-0300)
Subject: Merge tag 'upstream/2013.10.04'
X-Git-Url: https://git.rapsys.eu/youtubedl/commitdiff_plain/0a55ea74a5189ae5ba16d182df9a75995d367009?hp=--cc

Merge tag 'upstream/2013.10.04'

Upstream version 2013.10.04
---

0a55ea74a5189ae5ba16d182df9a75995d367009