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

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

acf1555d76f55c05516e23e45262dfd95df77314