From: Philipp Hagemeister <phihag@phihag.de>
Date: Mon, 16 Sep 2013 01:32:53 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=youtube-dl;a=commitdiff_plain;h=ef66b0c6effb9d8741807abb12b059560c97c8da

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

ef66b0c6effb9d8741807abb12b059560c97c8da