From: Philipp Hagemeister <phihag@phihag.de>
Date: Tue, 25 Feb 2014 00:45:00 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=eda1d49a62b92b3dbefd8b80702a5dec7f0617ad;p=youtube-dl

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

eda1d49a62b92b3dbefd8b80702a5dec7f0617ad