From: Rogério Brito <rbrito@ime.usp.br>
Date: Fri, 31 Oct 2014 20:42:43 +0000 (-0200)
Subject: Merge tag 'upstream/2014.10.30'
X-Git-Url: https://git.rapsys.eu/youtubedl/commitdiff_plain/6d835d4d6903cf5e18ad01844736929e06d16004?ds=sidebyside;hp=--cc

Merge tag 'upstream/2014.10.30'

Upstream version 2014.10.30
---

6d835d4d6903cf5e18ad01844736929e06d16004