[libreoffice] 02/02: 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 8b262bddfa0d179a46817ab0cd1c40f148c78488
Merge: 0227d01 e98a7be
Author: Rene Engelhard <rene at debian.org>
Date:   Thu Sep 22 22:37:39 2016 +0200

    Merge remote-tracking branch 'origin/master' into debian-experimental-5.2
    
    Conflicts:
    	changelog
    	patches/gtk3-lot-of-style-updated-signals.diff

 changelog | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --cc changelog
index 3dcd738,7432f73..9537a65
--- a/changelog
+++ b/changelog
@@@ -1,10 -1,4 +1,10 @@@
 +libreoffice (1:5.2.3~rc1~git20160920-1) UNRELEASED; urgency=medium
 +
 +  * New upstream snapshot
 +
 + -- Rene Engelhard <rene at debian.org>  Wed, 07 Sep 2016 23:57:23 +0200
 +
- libreoffice (1:5.2.2~rc1-1) UNRELEASED; urgency=medium
+ libreoffice (1:5.2.2~rc2-1) unstable; urgency=medium
  
    * New upstream release candidate
  

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