[libreoffice] 01/01: Merge remote-tracking branch 'origin/master' 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 bee88324e933a3e327cefbe39b00de7b46729372
Merge: c2601e8 798cf7e
Author: Rene Engelhard <rene at debian.org>
Date:   Fri Jul 21 16:45:16 2017 +0200

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

 changelog  | 11 +++++++++--
 control    |  8 ++++++--
 control.in |  5 +++--
 rules      |  6 ++++++
 4 files changed, 24 insertions(+), 6 deletions(-)

diff --cc changelog
index b98e9ee,5556bc5..da375cf
--- a/changelog
+++ b/changelog
@@@ -1,14 -1,6 +1,16 @@@
 +libreoffice (1:6.0.0~alpha0~git20170721-1) UNRELEASED; urgency=medium
 +
 +  [ Rene Engelhard ]
 +  * New upstream snapshot
 +
 +  [ Rico Tzschichholz ]
 +  * Add Kannada (kn) langpack
 +
 + -- Rene Engelhard <rene at debian.org>  Thu, 18 May 2017 12:54:08 +0200
 +
- libreoffice (1:5.4.0~rc2-2) UNRELEASED; urgency=medium
+ libreoffice (1:5.4.0~rc3-1) UNRELEASED; urgency=medium
+ 
+   * New upstream release candidate
  
    * debian/patches/examples-fix-SDK_AUTO_DEPLOYMENT-check.diff: don't try
      to do "auto deployment" when SDK_AUTO_DEPLOYMENT = NO...

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