[libreoffice] 01/01: 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 66f4f12a002f59aaceafb104ed0f4d750e0a95d6
Merge: 14745a2 d19f5c1
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Sun Sep 17 13:06:04 2017 +0200

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

 changelog                      |  2 ++
 patches/icu-no-icu-config.diff | 24 ++++++++++++++++++++++++
 patches/series                 |  1 +
 3 files changed, 27 insertions(+)

diff --cc patches/series
index 30de6a1,0b66a1e..58bc856
--- a/patches/series
+++ b/patches/series
@@@ -31,3 -31,6 +31,4 @@@ cppunit-optional.dif
  disable-unused-test-programs.diff
  gb_SUPPRESS_TESTS.diff
  stop-shipping-mimelnk-desktop-files.diff
 -java9.diff
 -make-helpimg-not-selectable-as-iconset.diff
+ icu-no-icu-config.diff

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