From: Philipp Hagemeister <phihag@phihag.de>
Date: Fri, 4 Apr 2014 20:44:49 +0000 (+0200)
Subject: Merge remote-tracking branch 'AGSPhoenix/teamcoco-fix'
X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=b84d6e7fc42affddeb1baf989cf394fedc41a96d;p=youtube-dl

Merge remote-tracking branch 'AGSPhoenix/teamcoco-fix'
---

b84d6e7fc42affddeb1baf989cf394fedc41a96d