From: Philipp Hagemeister <phihag@phihag.de>
Date: Thu, 11 Jul 2013 10:02:16 +0000 (+0200)
Subject: Merge remote-tracking branch 'yasoob/master'
X-Git-Url: https://git.cielonegro.org/gitweb.cgi?a=commitdiff_plain;h=3fa95508373bb5813099c2e4ccad95638a506916;p=youtube-dl.git

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

3fa95508373bb5813099c2e4ccad95638a506916