From: Rogério Brito <rbrito@ime.usp.br>
Date: Sun, 22 Jun 2014 14:48:32 +0000 (-0300)
Subject: Merge tag 'upstream/2014.06.19'
X-Git-Url: https://git.rapsys.eu/youtubedl/commitdiff_plain/d88adeed4f0a22f14db3a2b3fd3c59b266b97a78?ds=sidebyside;hp=-c

Merge tag 'upstream/2014.06.19'

Upstream version 2014.06.19
---

d88adeed4f0a22f14db3a2b3fd3c59b266b97a78