From: Ismael Mejia <iemejia@gmail.com>
Date: Fri, 6 Sep 2013 21:23:23 +0000 (+0200)
Subject: Merge branch 'master' into subtitles_rework
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=72836fcee453386f4f16325c5b8fa4c1ba1bb442;hp=72836fcee453386f4f16325c5b8fa4c1ba1bb442;p=youtube-dl

Merge branch 'master' into subtitles_rework
---