[libreoffice] branch debian-experimental-5.0 updated (1d09582 -> fa54f68)

[Rene Engelhard <rene@moszumanska.debian.org>]

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

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

      from  1d09582   Merge remote-tracking branch 'origin/master' into debian-experimental-5.0
       new  bc25e3d   there won't be a 1:5.0.2-2; merge changelogs
      adds  ddf508a   remove hardcoded dependency on openjdk-7-jdk in -subsequentcheckbase
      adds  a07e1b4   readd conflicts against openoffice-unbundled
       new  fa54f68   Merge remote-tracking branch 'origin/master' into debian-experimental-5.0

The 2 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                      | 11 ++++++-----
 control                        |  4 ++--
 control.in                     |  3 ++-
 control.subsequentcheckbase.in |  2 +-
 rules                          |  4 ----
 5 files changed, 11 insertions(+), 13 deletions(-)

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