From: Rogério Brito <rbrito@ime.usp.br>
Date: Thu, 9 Mar 2017 01:53:10 +0000 (-0300)
Subject: Merge tag 'upstream/2017.03.07'
X-Git-Url: https://git.rapsys.eu/youtubedl/commitdiff_plain/2b4515201a54c38e34434ea2817d606be134a7c9?hp=2b4515201a54c38e34434ea2817d606be134a7c9

Merge tag 'upstream/2017.03.07'

Upstream version 2017.03.07
---