From: Rogério Brito <rbrito@ime.usp.br>
Date: Fri, 16 Jan 2015 17:58:14 +0000 (-0200)
Subject: Merge tag 'upstream/2015.01.16'
X-Git-Url: https://git.rapsys.eu/youtubedl/commitdiff_plain/a070911bf98c751e4425008f1335cc57c86d30fc?ds=sidebyside

Merge tag 'upstream/2015.01.16'

Upstream version 2015.01.16
---

a070911bf98c751e4425008f1335cc57c86d30fc