From: Rogério Brito <rbrito@ime.usp.br>
Date: Wed, 22 Jul 2015 03:58:06 +0000 (-0300)
Subject: Merge tag 'upstream/2015.07.21'
X-Git-Url: https://git.rapsys.eu/youtubedl/commitdiff_plain/38bb9b1b0a044cabaf5691553815e334cd2e9213?hp=38bb9b1b0a044cabaf5691553815e334cd2e9213

Merge tag 'upstream/2015.07.21'

Upstream version 2015.07.21
---