From: Philipp Hagemeister <phihag@phihag.de>
Date: Mon, 16 Dec 2013 04:07:58 +0000 (+0100)
Subject: Merge remote-tracking branch 'mjorlitzky/master'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=1bb2fc98e05b7cc556aa63aa226b5349e8a39159;p=youtube-dl

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

1bb2fc98e05b7cc556aa63aa226b5349e8a39159