From: Philipp Hagemeister <phihag@phihag.de>
Date: Sun, 31 Aug 2014 21:57:51 +0000 (+0200)
Subject: Merge remote-tracking branch 'peugeot/beeg'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=youtube-dl;a=commitdiff_plain;h=2d7af094879401db25330cfddcdb81bbc1dadb2b

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

2d7af094879401db25330cfddcdb81bbc1dadb2b