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

Authored by rjvbb on Jan 15 2017, 12:20 PM.

Description

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

Merged Changes

CommitAuthorDetailsCommitted
31b813d0b67al10n daemon script
SVN_SILENT made messages (.desktop file) - always resolve ours 
Jan 15 2017