[libreoffice] 02/02: Merge remote-tracking branch 'origin/master' into debian-experimental-5.4

[Rene Engelhard]

This is an automated email from the git hooks/post-receive script.

rene pushed a commit to branch debian-experimental-5.4
in repository libreoffice.

commit d5653c4ab91f05775c69c295edca71124f11e053
Merge: effb2d1 4ac1a18
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Fri Dec 1 07:32:03 2017 +0000

    Merge remote-tracking branch 'origin/master' into debian-experimental-5.4

 changelog                               | 2 +-
 libreoffice-mysql-connector.triggers.in | 1 -
 libreoffice-wiki-publisher.triggers.in  | 1 -
 3 files changed, 1 insertion(+), 3 deletions(-)


-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git