[libreoffice] 01/01: Merge remote-tracking branch 'origin/debian-experimental-5.4' into debian-experimental-6.0

[Rene Engelhard]

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

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

commit 624be8a3e09f1daee158172bea61bd007386b730
Merge: ce6dbf8 8cde67f
Author: Rene Engelhard <rene at debian.org>
Date:   Mon Jun 19 19:54:43 2017 +0200

    Merge remote-tracking branch 'origin/debian-experimental-5.4' into debian-experimental-6.0

 changelog | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --cc changelog
index ba76059,3f308e8..ec92cb6
--- a/changelog
+++ b/changelog
@@@ -1,10 -1,10 +1,16 @@@
 +libreoffice (1:6.0.0~alpha0~git20170615-1) UNRELEASED; urgency=medium
 +
 +  * New upstream snapshot
 +
 + -- Rene Engelhard <rene at debian.org>  Thu, 18 May 2017 12:54:08 +0200
 +
- libreoffice (1:5.4.0~beta2-4) UNRELEASED; urgency=medium
+ libreoffice (1:5.4.0~rc1~git20170616-1) UNRELEASED; urgency=medium
+ 
+   * New upstream snapshot
+ 
+  -- Rene Engelhard <rene at debian.org>  Mon, 12 Jun 2017 23:44:55 +0200
+ 
+ libreoffice (1:5.4.0~beta2-4) experimental; urgency=medium
  
    * debian/patches/gb_SUPPRESS_TESTS.diff: add more tests to suppress
      (from master)

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