From: Ismael Mejia <iemejia@gmail.com>
Date: Thu, 22 Aug 2013 23:47:10 +0000 (+0200)
Subject: Merge branch 'master' into subtitles_rework
X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=youtube-dl;a=commitdiff_plain;h=bd2dee6c67b837bdebdd28d10d9586129021330e

Merge branch 'master' into subtitles_rework
---

bd2dee6c67b837bdebdd28d10d9586129021330e