From: Philipp Hagemeister <phihag@phihag.de>
Date: Tue, 28 Jan 2014 02:35:52 +0000 (+0100)
Subject: Merge remote-tracking branch 'mike/tumblr-url'
X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=218c15ab5935082f3e5c8589f6eaf0e437919a5d;p=youtube-dl

Merge remote-tracking branch 'mike/tumblr-url'
---

218c15ab5935082f3e5c8589f6eaf0e437919a5d