From: Philipp Hagemeister <phihag@phihag.de>
Date: Wed, 1 Jan 2014 09:43:58 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=youtube-dl;a=commitdiff_plain;h=33ec2ae8d9450a59273d2156bd2ef77d2bd93a66

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

33ec2ae8d9450a59273d2156bd2ef77d2bd93a66