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

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

commit 8870d056cbba6ca93028d1570506d130a5387c65
Merge: 8b16770 e93414b
Author: Rene Engelhard <rene@debian.org>
Date:   Mon Nov 23 20:07:37 2015 +0100

    Merge remote-tracking branch 'origin/master' into debian-experimental-5.1
    
    Conflicts:
    	changelog


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