From: Rogério Brito <rbrito@ime.usp.br>
Date: Thu, 5 Dec 2013 03:41:09 +0000 (-0200)
Subject: Merge tag 'upstream/2013.12.04'
X-Git-Url: https://git.rapsys.eu/youtubedl/commitdiff_plain/bc5059672e222ec4df4fe3983c399c0d0fca84d5?ds=sidebyside;hp=bc5059672e222ec4df4fe3983c399c0d0fca84d5

Merge tag 'upstream/2013.12.04'

Upstream version 2013.12.04
---