From: Rogério Brito <rbrito@ime.usp.br>
Date: Mon, 17 Feb 2014 21:16:48 +0000 (-0300)
Subject: Merge tag 'upstream/2014.02.17'
X-Git-Url: https://git.rapsys.eu/youtubedl/commitdiff_plain/848723ea972c09f28787db91d8c06e98a274ab89

Merge tag 'upstream/2014.02.17'

Upstream version 2014.02.17
---

848723ea972c09f28787db91d8c06e98a274ab89