From: Rogério Brito <rbrito@ime.usp.br>
Date: Tue, 2 Dec 2014 23:06:29 +0000 (-0200)
Subject: Merge tag 'upstream/2014.12.01'
X-Git-Url: https://git.rapsys.eu/youtubedl/commitdiff_plain/15b1d10671b48df598afd70e17ba21e9e64ac766

Merge tag 'upstream/2014.12.01'

Upstream version 2014.12.01
---

15b1d10671b48df598afd70e17ba21e9e64ac766