From: Rogério Brito <rbrito@ime.usp.br>
Date: Wed, 14 Sep 2011 05:17:02 +0000 (-0300)
Subject: Merge commit 'upstream/2011.09.14'
X-Git-Url: https://git.rapsys.eu/youtubedl/commitdiff_plain/20139be603ee4ddc72dfcefb9c474c730b57636a?ds=sidebyside;hp=--cc

Merge commit 'upstream/2011.09.14'
---

20139be603ee4ddc72dfcefb9c474c730b57636a