From: Philipp Hagemeister <phihag@phihag.de>
Date: Fri, 11 Jul 2014 08:54:53 +0000 (+0200)
Subject: Merge remote-tracking branch 'pachacamac/vodlocker'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=youtube-dl;a=commitdiff_plain;h=c09cbf0ed91ed54882abe6633b1e70e8a8b7db2d

Merge remote-tracking branch 'pachacamac/vodlocker'
---

c09cbf0ed91ed54882abe6633b1e70e8a8b7db2d