Merge branch 'master' of git://anongit.kde.org/kfloppy

Authored by arojas on Jul 25 2017, 5:02 PM.

Description

Merge branch 'master' of git://anongit.kde.org/kfloppy

Merged Changes

CommitAuthorDetailsCommitted
6df7be33bafdl10n daemon script
SVN_SILENT made messages (.desktop file) - always resolve ours 
Jul 25 2017
ced7af77461fl10n daemon script
GIT_SILENT made messages (after extraction) 
Jul 25 2017