kde-workspace/4.9 messed up

[Pino Toscano]

Hi,

somehow the master branch of kde-workspace has been merged in the 
KDE/4.9 branch, with obvious consequences.
Can anyone please fix this mess?

Thanks,
-- 
Pino Toscano

signature.asc
Description: This is a digitally signed message part.