From: Rogério Brito <rbrito@ime.usp.br>
Date: Thu, 30 Mar 2017 18:27:11 +0000 (-0300)
Subject: Merge tag 'upstream/2017.03.26'
X-Git-Url: https://git.rapsys.eu/youtubedl/commitdiff_plain/ed6eef637d5115dea4adc4e40f030f0688f29c37

Merge tag 'upstream/2017.03.26'

Upstream version 2017.03.26
---

ed6eef637d5115dea4adc4e40f030f0688f29c37