From: Rogério Brito <rbrito@ime.usp.br>
Date: Sun, 5 Aug 2012 03:46:23 +0000 (-0300)
Subject: Merge tag 'upstream/2012.02.27+gita171dbf'
X-Git-Url: https://git.rapsys.eu/youtubedl/commitdiff_plain/ee121ffd5cd3fe6fd1daa5699cae3becf3483dd3?ds=sidebyside

Merge tag 'upstream/2012.02.27+gita171dbf'

Upstream version 2012.02.27+gita171dbf
---

ee121ffd5cd3fe6fd1daa5699cae3becf3483dd3