From: Rogério Brito <rbrito@ime.usp.br>
Date: Fri, 6 Jan 2012 15:38:03 +0000 (-0200)
Subject: Merge commit 'upstream/2012.01.05'
X-Git-Url: https://git.rapsys.eu/youtubedl/commitdiff_plain/53b0892e0d78dd874acb6e22ed3e8c3f9fe175a4?ds=sidebyside

Merge commit 'upstream/2012.01.05'
---

53b0892e0d78dd874acb6e22ed3e8c3f9fe175a4