From: Rogério Brito <rbrito@ime.usp.br>
Date: Wed, 17 Aug 2016 12:19:42 +0000 (-0300)
Subject: Merge tag 'upstream/2016.08.17'
X-Git-Url: https://git.rapsys.eu/youtubedl/commitdiff_plain/99b46abf79266c2bf5eabc291dc4f366e61b5dde?ds=sidebyside;hp=-c

Merge tag 'upstream/2016.08.17'

Upstream version 2016.08.17
---

99b46abf79266c2bf5eabc291dc4f366e61b5dde