From: Rogério Brito <rbrito@ime.usp.br>
Date: Thu, 29 Aug 2013 22:09:34 +0000 (-0300)
Subject: Merge tag 'upstream/2013.08.29'
X-Git-Url: https://git.rapsys.eu/youtubedl/commitdiff_plain/a316b1d93c357b5edf19d5e3100526a94191c029?ds=sidebyside

Merge tag 'upstream/2013.08.29'

Upstream version 2013.08.29
---

a316b1d93c357b5edf19d5e3100526a94191c029