From: Rogério Brito <rbrito@ime.usp.br>
Date: Sun, 8 Jun 2014 13:58:43 +0000 (-0300)
Subject: Merge tag 'upstream/2014.06.07'
X-Git-Url: https://git.rapsys.eu/youtubedl/commitdiff_plain/415fdb62500dca2e22067a05008dfbf87c75b662?hp=-c

Merge tag 'upstream/2014.06.07'

Upstream version 2014.06.07
---

415fdb62500dca2e22067a05008dfbf87c75b662