From: Pierre Rudloff <contact@rudloff.pro>
Date: Wed, 28 Aug 2013 10:20:12 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=cd9c100963e8b8bf651d1f359e5f7812603ca0fd;p=youtube-dl

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

cd9c100963e8b8bf651d1f359e5f7812603ca0fd