From: Rogério Brito <rbrito@ime.usp.br>
Date: Wed, 16 Jul 2014 01:31:36 +0000 (-0300)
Subject: Merge tag 'upstream/2014.07.15'
X-Git-Url: https://git.rapsys.eu/youtubedl/commitdiff_plain/75535d182355c0cc00271ceae302e8e4aba9c04e?ds=sidebyside

Merge tag 'upstream/2014.07.15'

Upstream version 2014.07.15
---

75535d182355c0cc00271ceae302e8e4aba9c04e