From: Rogério Brito <rbrito@ime.usp.br>
Date: Wed, 6 Aug 2014 18:35:57 +0000 (-0300)
Subject: Merge tag 'upstream/2014.08.05'
X-Git-Url: https://git.rapsys.eu/youtubedl/commitdiff_plain/1931fa5f23ac75ea766517aa1b5ebf267ad3f97d?ds=inline;hp=-c

Merge tag 'upstream/2014.08.05'

Upstream version 2014.08.05
---

1931fa5f23ac75ea766517aa1b5ebf267ad3f97d