Merge remote-tracking branch 'origin/Plasma/5.1'

Authored by lueck on Oct 31 2014, 4:05 PM.

Description

Merge remote-tracking branch 'origin/Plasma/5.1'

Conflicts:
applets/icontasks/plasma-applet-org.kde.plasma.icontasks.desktop
kcms/access/kcmaccess.desktop
kcms/lookandfeel/autotests/lookandfeel/metadata.desktop
kcms/lookandfeel/kcm_lookandfeel.desktop
kcms/lookandfeel/package/metadata.desktop
layout-templates/org.kde.plasma.desktop.defaultPanel/metadata.desktop

Merged Changes

CommitAuthorDetailsCommitted
312a43c1b67bl10n daemon script
SVN_SILENT made messages (.desktop file) 
Oct 25 2014

Empty Commit

This commit is empty and does not affect any paths.