From: Rogério Brito <rbrito@ime.usp.br>
Date: Tue, 6 Aug 2013 20:36:02 +0000 (-0300)
Subject: Merge tag 'upstream/2013.08.02'
X-Git-Url: https://git.rapsys.eu/youtubedl/commitdiff_plain/467f1716f3b46ffc038848b9b08a833a7811be09?ds=sidebyside

Merge tag 'upstream/2013.08.02'

Upstream version 2013.08.02
---

467f1716f3b46ffc038848b9b08a833a7811be09