From: Pierre Rudloff <contact@rudloff.pro>
Date: Mon, 2 Sep 2013 23:27:49 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=youtube-dl;a=commitdiff_plain;h=b0446d6a33ed3b5789e57c83904f1d7cf1a85d19

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

b0446d6a33ed3b5789e57c83904f1d7cf1a85d19