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

[Rene Engelhard]

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

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

commit 14745a2875fb6e82f5eb3866443fb38ceb066b6b
Merge: e6a0919 6b62de5
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Sun Sep 17 11:55:47 2017 +0200

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

 changelog | 4 ++--
 rules     | 9 +++++++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --cc changelog
index ac5a544,e2c8e2b..52e9ca7
--- a/changelog
+++ b/changelog
@@@ -1,10 -1,4 +1,10 @@@
 +libreoffice (1:5.4.2~rc1-1) UNRELEASED; urgency=medium
 +
 +  * New upstream release candidate
 +
 + -- Rene Engelhard <rene at debian.org>  Sun, 17 Sep 2017 11:54:04 +0200
 +
- libreoffice (1:5.4.1-2) UNRELEASED; urgency=medium
+ libreoffice (1:5.4.1-2) unstable; urgency=medium
  
    * debian/patches/make-helpimg-not-selectable-as-iconset.diff: as name
      says, from libreoffice-5-4 branch (closes: #874196)

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