From: Philipp Hagemeister <phihag@phihag.de>
Date: Thu, 27 Jun 2013 15:58:42 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/HEAD'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=500f3d24324c8d9a53af2a55d9b3dd8c3db79eab;p=youtube-dl

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

500f3d24324c8d9a53af2a55d9b3dd8c3db79eab