From: Philipp Hagemeister <phihag@phihag.de>
Date: Mon, 21 Jul 2014 09:43:46 +0000 (+0200)
Subject: Merge remote-tracking branch 'hassaanaliw/snotr'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=youtube-dl;a=commitdiff_plain;h=199ece7eb83ffe7ba069b50080fe971df1db2d6c

Merge remote-tracking branch 'hassaanaliw/snotr'
---

199ece7eb83ffe7ba069b50080fe971df1db2d6c