[libreoffice] branch debian-experimental-6.0 updated (8ab7ab9 -> edcbf1c)

[Rene Engelhard]

This is an automated email from the git hooks/post-receive script.

rene pushed a change to branch debian-experimental-6.0
in repository libreoffice.

      from  8ab7ab9   fix merge
       new  edcbf1c   fix even more conflicts, sigh,.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 changelog | 24 +++++++++---------------
 1 file changed, 9 insertions(+), 15 deletions(-)

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