From: Rogério Brito <rbrito@ime.usp.br>
Date: Tue, 18 Dec 2012 11:14:18 +0000 (-0200)
Subject: Merge tag 'upstream/2012.12.11'
X-Git-Url: https://git.rapsys.eu/.gitweb.cgi/youtubedl/commitdiff_plain/c4994c6aff3e03c7848b0a9d4ff9a1873412d31f?hp=c4994c6aff3e03c7848b0a9d4ff9a1873412d31f

Merge tag 'upstream/2012.12.11'

Upstream version 2012.12.11
---