From: Philipp Hagemeister <phihag@phihag.de>
Date: Fri, 30 Jan 2015 02:09:19 +0000 (+0100)
Subject: Merge remote-tracking branch 'yan12125/IE_NextMedia'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=02c1d5e285e5d6c7f1a671610170526ab3ef8bd6;p=youtube-dl

Merge remote-tracking branch 'yan12125/IE_NextMedia'
---

02c1d5e285e5d6c7f1a671610170526ab3ef8bd6