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

[Rene Engelhard]

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

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

commit 0529840bc05b9c7e7193259db5557e72fc6546bb
Merge: 183e488 f801564
Author: Rene Engelhard <rene at debian.org>
Date:   Tue Oct 11 20:25:46 2016 +0200

    Merge remote-tracking branch 'origin/master' into debian-experimental-5.2
    
    Conflicts:
    	changelog

 changelog                                       |  8 +--
 patches/startcenter-grey-out-not-installed.diff | 71 +++++++++++++++++++++++++
 2 files changed, 76 insertions(+), 3 deletions(-)

diff --cc changelog
index 6636502,476d366..470ca81
--- a/changelog
+++ b/changelog
@@@ -1,14 -1,4 +1,14 @@@
 +libreoffice (1:5.2.3~rc1~git20161009-1) UNRELEASED; urgency=medium
 +
 +  * New upstream snapshot
 +
 +  * debian/rules:
 +    - install LOKDocView-0.1.typelib into multiarch dir as recommended by
 +      the GI mini policy
 +
 + -- Rene Engelhard <rene at debian.org>  Wed, 07 Sep 2016 23:57:23 +0200
 +
- libreoffice (1:5.2.2-1) UNRELEASED; urgency=medium
+ libreoffice (1:5.2.2-1) unstable; urgency=medium
  
    * LibreOffice 5.2.2 final release (identical to rc2)
  

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