From: Philipp Hagemeister <phihag@phihag.de>
Date: Tue, 25 Jun 2013 19:09:15 +0000 (+0200)
Subject: Merge remote-tracking branch 'yasoob/master'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=d746cd88c214338deb79cec25b597b3ef0732b5c;p=youtube-dl

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

d746cd88c214338deb79cec25b597b3ef0732b5c