From: Philipp Hagemeister <phihag@phihag.de>
Date: Tue, 22 Jul 2014 15:29:09 +0000 (+0200)
Subject: Merge remote-tracking branch 'jterk/cbs-artists'
X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=6ec7538bb4d5bbd81cee949966ed1f8c18ee1fff;p=youtube-dl

Merge remote-tracking branch 'jterk/cbs-artists'
---

6ec7538bb4d5bbd81cee949966ed1f8c18ee1fff