From: Rogério Brito <rbrito@ime.usp.br>
Date: Sun, 13 Jul 2014 15:22:00 +0000 (-0300)
Subject: Merge tag 'upstream/2014.07.11'
X-Git-Url: https://git.rapsys.eu/youtubedl/commitdiff_plain/beb6d38e0a0a4091007847a27022bf08c59f971c?ds=sidebyside

Merge tag 'upstream/2014.07.11'

Upstream version 2014.07.11
---

beb6d38e0a0a4091007847a27022bf08c59f971c