From: Rogério Brito <rbrito@ime.usp.br>
Date: Wed, 23 Oct 2013 23:24:02 +0000 (-0200)
Subject: Merge tag 'upstream/2013.10.23'
X-Git-Url: https://git.rapsys.eu/youtubedl/commitdiff_plain/54477c858fa2504360964e675faf953d78ac57e6?hp=-c

Merge tag 'upstream/2013.10.23'

Upstream version 2013.10.23
---

54477c858fa2504360964e675faf953d78ac57e6