From: Rogério Brito <rbrito@ime.usp.br>
Date: Sun, 16 Jun 2013 15:50:37 +0000 (-0300)
Subject: Merge tag 'upstream/2013.05.23'
X-Git-Url: https://git.rapsys.eu/youtubedl/commitdiff_plain/c924a4596d685b1d61cf7f28e242e2e492678b1f?hp=c924a4596d685b1d61cf7f28e242e2e492678b1f

Merge tag 'upstream/2013.05.23'

Upstream version 2013.05.23
---