From: Philipp Hagemeister <phihag@phihag.de>
Date: Sun, 9 Mar 2014 17:08:16 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=youtube-dl;a=commitdiff_plain;h=9e55e37a2e0e3a4e7d3fac2efd4ea13efe689b0e

Merge remote-tracking branch 'origin/master'
---

9e55e37a2e0e3a4e7d3fac2efd4ea13efe689b0e