[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 5a815a1b37770dff60ca60cffff17aaa6da2af1c
Merge: 5bb6cd0 f4e516d
Author: Rene Engelhard <rene at debian.org>
Date:   Tue Sep 13 06:39:28 2016 +0200

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

 changelog  | 28 +++++++++++++++++++++++-----
 control    | 23 +++++++++++++++++++----
 control.in | 19 ++++++++++++++++++-
 3 files changed, 60 insertions(+), 10 deletions(-)

diff --cc changelog
index cce2e96,52626f1..2763a86
--- a/changelog
+++ b/changelog
@@@ -1,10 -1,4 +1,10 @@@
 +libreoffice (1:5.2.2~rc1-1) UNRELEASED; urgency=medium
 +
 +  * New upstream release candidate
 +
 + -- Rene Engelhard <rene at debian.org>  Wed, 07 Sep 2016 23:57:23 +0200
 +
- libreoffice (1:5.2.1-2) UNRELEASED; urgency=medium
+ libreoffice (1:5.2.1-2) unstable; urgency=medium
  
    * debian/rules: install typesizes.h into
      usr/include/$(DEB_HOST_MULTIARCH)/libreoffice/sal/typesizes.h

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