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

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

b2ae513586cdf66b36ef4acc665c5eae17ee54a2