From: Philipp Hagemeister <phihag@phihag.de>
Date: Wed, 23 Oct 2013 09:40:46 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=365bcf6d975281ad769200cc8616872d0b6d6607;p=youtube-dl

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

365bcf6d975281ad769200cc8616872d0b6d6607