[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 93131dd51bbb4be2a8b231914351149c28d573dc
Merge: d6a7f4f 919831c
Author: Rene Engelhard <rene at debian.org>
Date:   Mon Jul 24 20:37:54 2017 +0200

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

 control                                | 7 ++-----
 control.in                             | 2 +-
 patches/fix-internal-hsqldb-build.diff | 2 +-
 rules                                  | 8 +++++---
 scripts/get_libebook_dep.sh            | 3 ++-
 5 files changed, 11 insertions(+), 11 deletions(-)


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