From: Rogério Brito <rbrito@ime.usp.br>
Date: Sun, 18 Aug 2013 10:25:44 +0000 (-0300)
Subject: Merge tag 'upstream/2013.08.17'
X-Git-Url: https://git.rapsys.eu/youtubedl/commitdiff_plain/964037ab68599390f87213a7dd6b45c3b105c2bb?ds=sidebyside;hp=-c

Merge tag 'upstream/2013.08.17'

Upstream version 2013.08.17
---

964037ab68599390f87213a7dd6b45c3b105c2bb