From: Rogério Brito <rbrito@ime.usp.br>
Date: Sat, 13 Jun 2015 19:25:34 +0000 (-0300)
Subject: Merge tag 'upstream/2015.06.04.1'
X-Git-Url: https://git.rapsys.eu/youtubedl/commitdiff_plain/139d14b198add5b26a11ed5dca022feaa6581d98

Merge tag 'upstream/2015.06.04.1'

Upstream version 2015.06.04.1
---

139d14b198add5b26a11ed5dca022feaa6581d98