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

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

38604f1a4f26c78b69898c639a8f75432c2d3382