[libreoffice] 01/02: 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 e0bb1d091329aa499962ae93229a6b33bfb2fde4
Merge: 93e61b0 82df501
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Thu Dec 14 23:42:27 2017 +0100

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

 changelog  |  5 ++++
 control    |  2 +-
 control.in |  6 ++---
 rules      | 79 ++++++++++++++++++++++++--------------------------------------
 4 files changed, 39 insertions(+), 53 deletions(-)


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