From: Philipp Hagemeister <phihag@phihag.de>
Date: Mon, 15 Sep 2014 21:26:54 +0000 (+0200)
Subject: Merge commit '98703c7fbfcf06348220aa63f9422cdd792cfe1a'
X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=2eebf060af9fe284cbcb839886b27030553fb48d;p=youtube-dl

Merge commit '98703c7fbfcf06348220aa63f9422cdd792cfe1a'
---

2eebf060af9fe284cbcb839886b27030553fb48d