From: Rogério Brito <rbrito@ime.usp.br>
Date: Wed, 30 Nov 2016 19:22:54 +0000 (-0200)
Subject: Merge tag 'upstream/2016.12.01'
X-Git-Url: https://git.rapsys.eu/youtubedl/commitdiff_plain/47d80ec0b18245caeb97018d4c1af18d0b5b972b

Merge tag 'upstream/2016.12.01'

Upstream version 2016.12.01
---

47d80ec0b18245caeb97018d4c1af18d0b5b972b