Summary of changes: 6e646a8... Conflicts: plasma-workspace < plasma-workspace-5.2.0-8 (*) e3c533b... fix changelog (*) (*) This commit already existed in another branch; no separate mail sent