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)
commit6ec7538bb4d5bbd81cee949966ed1f8c18ee1fff
treeff31ad5de8a3a2a4b1da8880703832664e70e54d
parent1771ddd85db7acda1e4174ccd186acd40a881fbc
parent2871d489a91b6de1a5849243e4d827123dd564ef
Merge remote-tracking branch 'jterk/cbs-artists'