From: Rogério Brito <rbrito@ime.usp.br>
Date: Thu, 4 Jul 2013 11:48:29 +0000 (-0300)
Subject: Merge tag 'upstream/2013.07.02'
X-Git-Url: https://git.rapsys.eu/youtubedl/commitdiff_plain/feb5020b37d7d3ba4005a8bac6f4efece4ce4b8c?ds=sidebyside

Merge tag 'upstream/2013.07.02'

Upstream version 2013.07.02
---

feb5020b37d7d3ba4005a8bac6f4efece4ce4b8c