From: Philipp Hagemeister <phihag@phihag.de>
Date: Sun, 31 Aug 2014 21:45:24 +0000 (+0200)
Subject: Merge remote-tracking branch 'peugeot/hornbunny'
X-Git-Url: https://git.cielonegro.org/gitweb.cgi?a=commitdiff_plain;h=5a3f0d9aeef3d50f28c47061e1128da115f5a06f;p=youtube-dl.git

Merge remote-tracking branch 'peugeot/hornbunny'
---

5a3f0d9aeef3d50f28c47061e1128da115f5a06f