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

[Rene Engelhard]

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

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

commit 226320a8abde6e1b15c9f93c2d9bdd3ef1575274
Merge: bbd1720 1cba223
Author: Rene Engelhard <rene at debian.org>
Date:   Sun Dec 17 00:12:30 2017 +0100

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

 rules | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


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