From: Philipp Hagemeister <phihag@phihag.de>
Date: Sun, 25 Jan 2015 04:30:47 +0000 (+0100)
Subject: Merge branch 'travis-rtmp'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=youtube-dl;a=commitdiff_plain;h=767ff0a2d19a162edc5ea2d33e82ddb30ae244c8

Merge branch 'travis-rtmp'
---

767ff0a2d19a162edc5ea2d33e82ddb30ae244c8