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

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

27f774862d583efcfbeb6f97bee53b333a0b95a9