From: Philipp Hagemeister <phihag@phihag.de>
Date: Sun, 23 Jun 2013 16:45:50 +0000 (+0200)
Subject: Merge remote-tracking branch 'yasoob/master'
X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=63ef586b056b8b50b7711c122f52ee472540a254;p=youtube-dl

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

63ef586b056b8b50b7711c122f52ee472540a254