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

[Rene Engelhard]

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 5a5e27a0a11c93c3f6c72ee15764ddfca4fcf790
Merge: 0529840 f5dd710
Author: Rene Engelhard <rene at debian.org>
Date:   Tue Oct 11 20:28:58 2016 +0200

    Merge remote-tracking branch 'origin/master' into debian-experimental-5.2
    
    Conflicts:
    	patches/series

 changelog      | 5 ++++-
 patches/series | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --cc patches/series
index 8d6d406,757c7ec..a6e4f7a
--- a/patches/series
+++ b/patches/series
@@@ -30,3 -30,6 +30,4 @@@ rsc-no-error-about-unknown-switch.dif
  debian-branding.diff
  no-packagekit-per-default.diff
  sparc64.diff
 -gtk3-use-style-updated-signal.diff
 -gtk3-lot-of-style-updated-signals.diff
+ startcenter-grey-out-not-installed.diff

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