From: Rogério Brito <rbrito@ime.usp.br>
Date: Wed, 10 Jul 2013 21:15:07 +0000 (-0300)
Subject: Merge tag 'upstream/2013.07.10'
X-Git-Url: https://git.rapsys.eu/youtubedl/commitdiff_plain/179629569ec7a2eda04957287c17fab7e55b1a7f?ds=sidebyside

Merge tag 'upstream/2013.07.10'

Upstream version 2013.07.10
---

179629569ec7a2eda04957287c17fab7e55b1a7f