merging master to frameworks

[Boudewijn Rempt]

I'm doing a merge now...

Boudewijn
_______________________________________________
calligra-devel mailing list
calligra-devel@kde.org
https://mail.kde.org/mailman/listinfo/calligra-devel