From: Philipp Hagemeister <phihag@phihag.de>
Date: Fri, 16 May 2014 10:04:24 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=ea102818c9f9b9af796f530f83ec4e601bfbeabe;p=youtube-dl

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

ea102818c9f9b9af796f530f83ec4e601bfbeabe