This is an automated email from the git hooks/post-receive script. rene pushed a commit to branch debian-experimental-5.2 in repository libreoffice.
commit bab1e246b5e1eafc74fa671e3b8249a8e054daa2 Merge: 562e1df 4532fb6 Author: Rene Engelhard <r...@debian.org> Date: Thu May 19 09:16:55 2016 +0200 Merge remote-tracking branch 'origin/master' into debian-experimental-5.2 Conflicts: changelog changelog | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git