[libreoffice] 01/02: Merge remote-tracking branch 'origin/master' into debian-experimental-5.0
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-5.0
in repository libreoffice.
commit 92ae864f989fb664a03bcbdc2d0ac51106cd5df9
Merge: 28a9f68 6986bb4
Author: Rene Engelhard <rene@debian.org>
Date: Fri Jul 31 01:09:05 2015 +0200
Merge remote-tracking branch 'origin/master' into debian-experimental-5.0
Conflicts:
changelog
rules | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: