Merge branch 'master' of git.kde.org:plasma-workspace

Authored by lesliezhai on Mar 8 2017, 2:44 AM.

Description

Merge branch 'master' of git.kde.org:plasma-workspace

Merged Changes

CommitAuthorDetailsCommitted
b44f93a67bdbl10n daemon script
SVN_SILENT made messages (.desktop file) - always resolve ours 
Mar 7 2017