From: Rogério Brito <rbrito@ime.usp.br>
Date: Fri, 28 Sep 2012 05:27:12 +0000 (-0300)
Subject: Merge tag 'upstream/2012.09.27'
X-Git-Url: https://git.rapsys.eu/youtubedl/commitdiff_plain/1169b048fab1ef2e5cbad85340928b8c69dd2758?ds=sidebyside

Merge tag 'upstream/2012.09.27'

Upstream version 2012.09.27
---

1169b048fab1ef2e5cbad85340928b8c69dd2758