From: Philipp Hagemeister <phihag@phihag.de>
Date: Fri, 22 Aug 2014 00:45:21 +0000 (+0200)
Subject: Merge remote-tracking branch 'liudongmiao/patch-subtitle'
X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=bd9820c937be846e0e1067395fbf133102c45e79;p=youtube-dl

Merge remote-tracking branch 'liudongmiao/patch-subtitle'
---

bd9820c937be846e0e1067395fbf133102c45e79