[libreoffice] 02/02: Merge remote-tracking branch 'origin/master' into debian-experimental-5.1
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 95a58c8d489babcd62802df142ead2c56d300ff5
Merge: 94476b5 c5b3fcc
Author: Rene Engelhard <rene@debian.org>
Date: Thu Feb 4 13:31:44 2016 +0100
Merge remote-tracking branch 'origin/master' into debian-experimental-5.1
Conflicts:
changelog
libreoffice-common.maintscript
libreoffice-common.postinst.in
libreoffice-common.postrm.in
libreoffice-common.preinst.in
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: