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

[Rene Engelhard]

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

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

commit 6b1aca98a52babcf922e69ed03d0eee0d31ba392
Merge: bf6ec46 c8e544a
Author: Rene Engelhard <rene at debian.org>
Date:   Tue Jun 6 18:56:04 2017 +0200

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

 changelog      |  7 +++++--
 patches/series |  1 +
 rules          | 12 ++++++++----
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --cc changelog
index 7b421d4,7e00215..3b4d17b
--- a/changelog
+++ b/changelog
@@@ -1,10 -1,4 +1,10 @@@
 +libreoffice (1:5.5.0~alpha0~git20170605-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~git20170603-1) UNRELEASED; urgency=medium
+ libreoffice (1:5.4.0~beta2~git20170606-1) UNRELEASED; urgency=medium
  
    * New upstream snapshot
      - is now able to do "insert->image, choose pdf". Not insert->docunent

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