[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 26a02a6a8e24a1fdc7f36f70183d5b2487d6d547
Merge: 93131dd 53adaea
Author: Rene Engelhard <rene at debian.org>
Date:   Mon Jul 24 21:03:22 2017 +0200

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

 changelog | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --cc changelog
index f038e19,79632cd..8cb42dd
--- a/changelog
+++ b/changelog
@@@ -1,16 -1,8 +1,21 @@@
 +libreoffice (1:6.0.0~alpha0~git20170723-1) UNRELEASED; urgency=medium
 +
 +  [ Rene Engelhard ]
 +  * New upstream snapshot
 +
++  * merge from Ubuntu, thanks Rico Tzschichholz:
++    - Add "elementary" style package
++
 +  [ 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~rc3-1) UNRELEASED; urgency=medium
+ libreoffice (1:5.4.0-1) unstable; urgency=medium
  
-   * New upstream release candidate
+   * New upstream release
+ 
+   * upload to unstable
  
    * 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