From: Philipp Hagemeister <phihag@phihag.de>
Date: Sat, 20 Jul 2013 09:23:56 +0000 (+0200)
Subject: Merge remote-tracking branch 'yasoob/master'
X-Git-Url: https://git.cielonegro.org/gitweb.cgi?a=commitdiff_plain;h=b390d85d95fd9031668f2ae61b3f5594f4d297a7;p=youtube-dl.git

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

b390d85d95fd9031668f2ae61b3f5594f4d297a7