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
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 190 bytes
Desc: This is a digitally signed message part.
URL: <http://mail.kde.org/pipermail/kde-core-devel/attachments/20121111/64a0e3da/attachment.sig>