From: Rogério Brito <rbrito@ime.usp.br>
Date: Mon, 18 May 2015 10:48:42 +0000 (-0300)
Subject: Merge tag 'upstream/2015.05.15'
X-Git-Url: https://git.rapsys.eu/youtubedl/commitdiff_plain/7df4343e553a9942a290e5e1dffe931261ab844e?ds=sidebyside

Merge tag 'upstream/2015.05.15'

Upstream version 2015.05.15
---

7df4343e553a9942a290e5e1dffe931261ab844e