From: Rogério Brito <rbrito@ime.usp.br>
Date: Sat, 25 Jun 2016 01:51:51 +0000 (-0300)
Subject: Merge tag 'upstream/2016.06.25'
X-Git-Url: https://git.rapsys.eu/youtubedl/commitdiff_plain/fe979149c83b5a935f7d28baf75848a9137316fd?ds=inline;hp=fe979149c83b5a935f7d28baf75848a9137316fd

Merge tag 'upstream/2016.06.25'

Upstream version 2016.06.25
---