From: Philipp Hagemeister <phihag@phihag.de>
Date: Sun, 28 Sep 2014 08:52:23 +0000 (+0200)
Subject: Merge remote-tracking branch 'r4mos/played'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=youtube-dl;a=commitdiff_plain;h=f0b8e3607db6bc2e7cdfcf3175e85d9bccb22229

Merge remote-tracking branch 'r4mos/played'
---

f0b8e3607db6bc2e7cdfcf3175e85d9bccb22229