[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 a6e14a5def2cbbdf57b5a357293c744fd1d17c6a
Merge: c84ed7c ad256c6
Author: Rene Engelhard <rene at debian.org>
Date:   Sun Oct 15 12:30:22 2017 +0200

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

 changelog                      |  4 ++-
 control                        |  4 ---
 control.nlpsolver.in           |  1 -
 control.ogltrans.in            |  1 -
 control.subsequentcheckbase.in |  1 -
 control.systray.in             |  1 -
 control.transitionals.in       |  1 -
 copyright                      | 79 +++++++++++++++++++++++++++++++++++++++++-
 pycompat                       |  1 -
 source/lintian-overrides       |  2 ++
 10 files changed, 83 insertions(+), 12 deletions(-)


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