From: Philipp Hagemeister <phihag@phihag.de>
Date: Mon, 22 Sep 2014 10:53:41 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=45c85d7ba1dbca09c7ded9130fa5670b302e099b;p=youtube-dl

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

45c85d7ba1dbca09c7ded9130fa5670b302e099b