From: Rogério Brito <rbrito@ime.usp.br>
Date: Sun, 23 Jun 2013 23:10:30 +0000 (-0300)
Subject: Merge tag 'upstream/2013.06.26'
X-Git-Url: https://git.rapsys.eu/youtubedl/commitdiff_plain/bddc9fc577d16b1428924bf8a5c37ef1d9295f14?ds=inline;hp=bddc9fc577d16b1428924bf8a5c37ef1d9295f14

Merge tag 'upstream/2013.06.26'

Upstream version 2013.06.26
---