[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 a210f8f0a4efa1307df1cb63f15ef095f759bb08
Merge: 67ae81c 599a9eb
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Tue Jul 4 07:49:49 2017 +0200

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

 control              | 6 +++---
 control.nlpsolver.in | 2 +-
 control.ogltrans.in  | 2 +-
 control.systray.in   | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)


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