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

[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.3
in repository libreoffice.

commit 4fdd8548ecc5a18076ae4d863db207d779af0c9e
Merge: 50923df 1c6194f
Author: Rene Engelhard <rene@debian.org>
Date:   Fri Jun 3 23:45:56 2016 +0200

    Merge remote-tracking branch 'origin/debian-experimental-5.2' into debian-experimental-5.3
    
    Conflicts:
    	rules

 changelog                          | 8 ++++++--
 control                            | 2 +-
 libreoffice-calc.lintian-overrides | 1 +
 rules                              | 6 +-----
 tests/control                      | 2 +-
 5 files changed, 10 insertions(+), 9 deletions(-)


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