Merge remote-tracking branch 'jterk/cbs-artists'
authorPhilipp Hagemeister <phihag@phihag.de>
Tue, 22 Jul 2014 15:29:09 +0000 (17:29 +0200)
committerPhilipp Hagemeister <phihag@phihag.de>
Tue, 22 Jul 2014 15:29:09 +0000 (17:29 +0200)

Trivial merge