From: Rogério Brito <rbrito@ime.usp.br>
Date: Sun, 19 Jan 2014 04:38:24 +0000 (-0200)
Subject: Merge tag 'upstream/2014.01.17.2'
X-Git-Url: https://git.rapsys.eu/youtubedl/commitdiff_plain/d1a5eac72c0b1116e8efbbf50766d8d00678f5c8?ds=sidebyside;hp=-c

Merge tag 'upstream/2014.01.17.2'

Upstream version 2014.01.17.2
---

d1a5eac72c0b1116e8efbbf50766d8d00678f5c8