From: Rogério Brito <rbrito@ime.usp.br>
Date: Sat, 25 Feb 2017 00:07:42 +0000 (-0300)
Subject: Merge tag 'upstream/2017.02.24.1'
X-Git-Url: https://git.rapsys.eu/youtubedl/commitdiff_plain/9fb40a4e5f59ba243dee2edad23a2c5555338113?hp=9fb40a4e5f59ba243dee2edad23a2c5555338113

Merge tag 'upstream/2017.02.24.1'

Upstream version 2017.02.24.1
---