From: Pierre Rudloff <contact@rudloff.pro>
Date: Sat, 24 Aug 2013 21:01:39 +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=5c6658d4dd5ea4f25e8ae8b62a47b09f164cd30b

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

5c6658d4dd5ea4f25e8ae8b62a47b09f164cd30b