[libreoffice] 01/01: Merge remote-tracking branch 'origin/master' into debian-experimental-5.2

[Rene Engelhard <rene@moszumanska.debian.org>]

This is an automated email from the git hooks/post-receive script.

rene pushed a commit to branch debian-experimental-5.2
in repository libreoffice.

commit f6fc5a5cedd55a2c94fa9b51bb65791626bae251
Merge: 7beada7 ef7ae89
Author: Rene Engelhard <rene@debian.org>
Date:   Fri Jul 22 10:01:41 2016 +0200

    Merge remote-tracking branch 'origin/master' into debian-experimental-5.2
    
    Conflicts:
    	libreoffice-core.bug-script.in

 libreoffice-core.bug-script.in | 2 +-
 ure.bug-script.in              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --cc libreoffice-core.bug-script.in
index a5b2aae,d8a468c..3de70c2
--- a/libreoffice-core.bug-script.in
+++ b/libreoffice-core.bug-script.in
@@@ -17,4 -17,4 +17,4 @@@ f
  # installed VCLplugs
  echo "" >&3
  echo "Installed VCLplugs:" >&3
- dpkg -l libreoffice-gtk2 libreoffice-gtk3 libreoffice-kde
 -dpkg -l libreoffice-gtk libreoffice-gtk3 libreoffice-kde >&3
++dpkg -l libreoffice-gtk2 libreoffice-gtk3 libreoffice-kde >&3

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