From: Rogério Brito <rbrito@ime.usp.br>
Date: Mon, 24 Nov 2014 00:01:06 +0000 (-0200)
Subject: Merge tag 'upstream/2014.11.23'
X-Git-Url: https://git.rapsys.eu/youtubedl/commitdiff_plain/0fce975b3a15ab01d247e9f737ca4589b7ceebd7?ds=inline

Merge tag 'upstream/2014.11.23'

Upstream version 2014.11.23
---

0fce975b3a15ab01d247e9f737ca4589b7ceebd7