From: Philipp Hagemeister <phihag@phihag.de>
Date: Mon, 18 Feb 2013 22:12:56 +0000 (+0100)
Subject: Merge remote-tracking branch 'jaimeMF/TED'
X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=197080b10be36cbeccfe33b8de09a6a8a255f609;p=youtube-dl

Merge remote-tracking branch 'jaimeMF/TED'
---

197080b10be36cbeccfe33b8de09a6a8a255f609