From: Philipp Hagemeister <phihag@phihag.de>
Date: Wed, 28 Aug 2013 10:57:44 +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=204da0d3e3cc5f8675f10f44d0717e210405f8ca

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

204da0d3e3cc5f8675f10f44d0717e210405f8ca