From: Philipp Hagemeister <phihag@phihag.de>
Date: Thu, 21 Aug 2014 23:38:59 +0000 (+0200)
Subject: Merge remote-tracking branch 'yasoob/master'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=a200f4cee21093975d881190c6ff4227f5490594;hp=-c;p=youtube-dl

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

a200f4cee21093975d881190c6ff4227f5490594