From: Rogério Brito <rbrito@ime.usp.br>
Date: Wed, 7 Aug 2013 23:21:54 +0000 (-0300)
Subject: Merge tag 'upstream/2013.08.08'
X-Git-Url: https://git.rapsys.eu/youtubedl/commitdiff_plain/8a5ee64c617eef3a94a3044bffb9793cfe118218?hp=--cc

Merge tag 'upstream/2013.08.08'

Upstream version 2013.08.08
---

8a5ee64c617eef3a94a3044bffb9793cfe118218