[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 f79b114b68a514380229cc267cbf061afd143a79
Merge: 3bb7c31 854ef2e
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Sun Nov 26 00:21:27 2017 +0100

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

 changelog      | 17 +++++++++++++----
 control        | 11 ++++++-----
 control.in     |  9 +++++----
 control.kde.in |  2 +-
 rules          | 39 +++++++++++++++++++++++++++++++--------
 5 files changed, 56 insertions(+), 22 deletions(-)


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