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

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

1301a0dd426a88ed39d38ac6ad04e9000c7811a4