[libreoffice] 03/03: 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 0dff1fd473bbfdd41fcc3e2f8e6b4c8e89429fd5
Merge: a9c4354 854ef2e
Author: Rene Engelhard <rene at debian.org>
Date:   Sat Nov 25 17:01:36 2017 +0100

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

 rules | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


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