[libreoffice] branch debian-experimental-6.0 updated (edcbf1c -> 55dd12e)

[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  edcbf1c   fix even more conflicts, sigh,.
      adds  9ffd138   also mv control.reportdesign.in -> control.reportbuilder.in
      adds  380f5db   regen control
       new  55dd12e   Merge remote-tracking branch 'origin/master' into debian-experimental-6.0

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                                          |  5 +++--
 control                                            | 26 +++++++++++-----------
 ...rol.reportdesign.in => control.reportbuilder.in |  2 +-
 rules                                              |  2 +-
 4 files changed, 18 insertions(+), 17 deletions(-)
 rename control.reportdesign.in => control.reportbuilder.in (97%)

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