[libreoffice] 01/01: 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 6a2d3d49c6261b135dfa929afd02de7396b27d05
Merge: dc3b887 1278bff
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Sat May 27 12:05:57 2017 +0200

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

 changelog | 3 ++-
 rules     | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)


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