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

[Rene Engelhard]

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

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

commit 3913906029b5a839d30f8f5ed02c03c8f41c3fbc
Merge: bb9235a 89d360a
Author: Rene Engelhard <rene at debian.org>
Date:   Tue Jun 6 23:34:07 2017 +0200

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

 changelog                     |  4 ++--
 patches/cppunit-optional.diff | 20 ++++++++++++++++++++
 2 files changed, 22 insertions(+), 2 deletions(-)


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