From: Pierre Rudloff <contact@rudloff.pro>
Date: Tue, 27 Aug 2013 08:47:47 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=c5b921b5975f84ec31077cf5333f14736efe40b6;p=youtube-dl

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

c5b921b5975f84ec31077cf5333f14736efe40b6