From: Rogério Brito <rbrito@ime.usp.br>
Date: Sat, 22 Nov 2014 18:03:25 +0000 (-0200)
Subject: Merge tag 'upstream/2014.11.21'
X-Git-Url: https://git.rapsys.eu/youtubedl/commitdiff_plain/099764c0c91f4ad7db03d9347798f8619383ea7e?ds=sidebyside;hp=--cc

Merge tag 'upstream/2014.11.21'

Upstream version 2014.11.21
---

099764c0c91f4ad7db03d9347798f8619383ea7e