From: Rogério Brito <rbrito@ime.usp.br>
Date: Tue, 2 Jul 2013 00:43:33 +0000 (-0300)
Subject: Merge tag 'upstream/2013.06.34'
X-Git-Url: https://git.rapsys.eu/youtubedl/commitdiff_plain/11c4ce5827158ef3f817f2536e220d95e0576e6e?hp=11c4ce5827158ef3f817f2536e220d95e0576e6e

Merge tag 'upstream/2013.06.34'

Upstream version 2013.06.34
---