[libreoffice] 03/06: Merge branch '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 0b632424f6743578c704b0fc1f127caf050ad3be
Merge: 190bde7 7305374
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Mon Dec 19 14:56:13 2016 +0100

    Merge branch 'master' into debian-experimental-5.3
    
    Conflicts:
    	changelog
    	rules


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