From: Philipp Hagemeister <phihag@phihag.de>
Date: Tue, 24 Sep 2013 19:40:30 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=commitdiff_plain;h=f426de84606fd0807a5ab38c0733032d790b056e;hp=-c;p=youtube-dl.git

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

f426de84606fd0807a5ab38c0733032d790b056e