[libreoffice] 01/02: 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 a27fe87d5a7c34bbac7487d34cf5be32e6cead3e
Merge: 9ed4cfa be51d78
Author: Rene Engelhard <rene at debian.org>
Date:   Sat Jul 15 11:36:39 2017 +0000

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

 changelog | 6 ++++--
 rules     | 6 +++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --cc changelog
index 5235749,6a58469..f9d9dd1
--- a/changelog
+++ b/changelog
@@@ -1,10 -1,4 +1,10 @@@
 +libreoffice (1:6.0.0~alpha0~git20170713-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~rc2-1) UNRELEASED; urgency=medium
+ libreoffice (1:5.4.0~rc2-1) experimental; urgency=medium
  
    * New upstream release candidate
  

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