[libreoffice] 02/02: 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 af2dbec4a7c9bd12edcb20d30acc967e2a349d33
Merge: d6d9895 9f417f7
Author: Rene Engelhard <rene at debian.org>
Date:   Sat Jul 22 00:28:25 2017 +0200

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

 control    |  8 ++++----
 control.in |  2 +-
 rules      | 11 +++++++----
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --cc control
index 6d4bbd6,3a673f4..1f8ce25
--- a/control
+++ b/control
@@@ -194,9 -194,9 +194,9 @@@ Build-Conflicts: amd-libopencl1
                   nvidia-libopencl1,
                   qt3-dev-tools
  Standards-Version: 4.0.0
 -Vcs-Git: https://anonscm.debian.org/git/pkg-openoffice/libreoffice.git
 +Vcs-Git: https://anonscm.debian.org/git/pkg-openoffice/libreoffice.git -b debian-experimental-6.0
  Vcs-Browser: https://anonscm.debian.org/git/pkg-openoffice/libreoffice.git
- Bugs: mailto:debian-openoffice at lists.debian.org
+ Bugs: 
  Homepage: http://www.libreoffice.org
  
  Package: libreoffice

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