From: Ismael Mejia <iemejia@gmail.com>
Date: Wed, 11 Sep 2013 12:26:48 +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=cf1dd0c59e8ff4c66130bc47954c415be5db8cc3

Merge branch 'master' into subtitles_rework
---

cf1dd0c59e8ff4c66130bc47954c415be5db8cc3