From: Philipp Hagemeister <phihag@phihag.de>
Date: Mon, 25 Nov 2013 05:16:18 +0000 (+0100)
Subject: Merge remote-tracking branch 'rzhxeo/rtmpdump'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=youtube-dl;a=commitdiff_plain;h=31cb6d8fefaa42aff293b03e37471bb05d5b8391

Merge remote-tracking branch 'rzhxeo/rtmpdump'
---

31cb6d8fefaa42aff293b03e37471bb05d5b8391