From: Philipp Hagemeister <phihag@phihag.de>
Date: Tue, 15 Oct 2013 00:11:33 +0000 (+0200)
Subject: Merge remote-tracking branch 'Rudloff/websurg'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=youtube-dl;a=commitdiff_plain;h=4f41664de8e0486127d8dd16168d829c26f79fdf

Merge remote-tracking branch 'Rudloff/websurg'
---

4f41664de8e0486127d8dd16168d829c26f79fdf