From: Rogério Brito <rbrito@ime.usp.br>
Date: Thu, 26 Dec 2013 18:41:27 +0000 (-0200)
Subject: Merge tag 'upstream/2013.12.23'
X-Git-Url: https://git.rapsys.eu/youtubedl/commitdiff_plain/63a6927374492ef47c8fd6de67d0760ace4dd0ed?ds=sidebyside;hp=--cc

Merge tag 'upstream/2013.12.23'

Upstream version 2013.12.23
---

63a6927374492ef47c8fd6de67d0760ace4dd0ed