Merge branch 'Plasma/5.6'

Authored by broulik on Apr 30 2016, 4:21 PM.

Description

Merge branch 'Plasma/5.6'

Merged Changes

CommitAuthorDetailsCommitted
71055e2b725fRob Wu/broulik
[taskmanager] Stop parsing executables as .desktop files 
Apr 30 2016
401bf1336cc5l10n daemon script
SVN_SILENT made messages (.desktop file) - always resolve ours 
Apr 30 2016
ef984a4cf8dbl10n daemon script
SVN_SILENT made messages (.desktop file) - always resolve ours 
Apr 28 2016