[libreoffice] 01/01: 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 ba74420dc77a77f5ebc4dba682bc779ed19634f2
Merge: 262381e e9e846b
Author: Rene Engelhard <rene at debian.org>
Date:   Wed Jun 7 08:07:45 2017 +0200

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

 changelog  |  6 +++---
 control    |  2 +-
 control.in |  2 +-
 rules      | 11 ++++-------
 4 files changed, 9 insertions(+), 12 deletions(-)

diff --cc changelog
index b9fbb1e,49f7eea..76313d5
--- a/changelog
+++ b/changelog
@@@ -1,12 -1,6 +1,12 @@@
 +libreoffice (1:5.5.0~alpha0~git20170606-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~git20170606-1) UNRELEASED; urgency=medium
+ libreoffice (1:5.4.0~beta2-1) UNRELEASED; urgency=medium
  
-   * New upstream snapshot
+   * New upstream beta release
      - is now able to do "insert->image, choose pdf". Not insert->docunent
        but close enough, so this closes: #814598
        (unfortunately only using internal pdfium. sigh.)

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