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: http://git.bitcoin.ninja/index.cgi?p=youtube-dl;a=commitdiff_plain;h=b390d85d95fd9031668f2ae61b3f5594f4d297a7

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

b390d85d95fd9031668f2ae61b3f5594f4d297a7