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

[Rene Engelhard]

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 27a5a355837d737140c16fb5f408cad7c3cdda09
Merge: f9ef655 f15e62f
Author: Rene Engelhard <rene at debian.org>
Date:   Wed Nov 30 20:48:46 2016 +0100

    Merge remote-tracking branch 'origin/master' into debian-experimental-5.3
    
    Conflicts:
    	changelog
    	rules
    	source/include-binaries

 rules                        | 13 +++++--------
 shlibs.override.mysqlcppconn |  1 -
 2 files changed, 5 insertions(+), 9 deletions(-)


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