From: Pierre Rudloff <contact@rudloff.pro>
Date: Fri, 30 Aug 2013 22:37:29 +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=847f582290c6ad6ec0c72760ea3cfa6417d28e3c

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

847f582290c6ad6ec0c72760ea3cfa6417d28e3c