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

[Rene Engelhard <rene@moszumanska.debian.org>]

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 9ac5c4e60150e719448f4d20c3b272ddfd1176f3
Merge: 2ce8f81 4d0c964
Author: Rene Engelhard <rene@debian.org>
Date:   Wed Jan 20 16:41:03 2016 +0100

    Merge remote-tracking branch 'origin/debian-experimental-5.1' into debian-experimental-5.2
    
    Conflicts:
    	patches/series

 changelog | 5 +++++
 1 file changed, 5 insertions(+)

diff --cc changelog
index a9bb0df,2950a6f..089c16f
--- a/changelog
+++ b/changelog
@@@ -1,11 -1,10 +1,16 @@@
 +libreoffice (1:5.2.0~alpha1~git20160120-1) UNRELEASED; urgency=medium
 +
 +  * New upstream snapshot
 +
 + -- Rene Engelhard <rene@rene-engelhard.de>  Thu, 26 Nov 2015 10:37:57 +0100
 +
  libreoffice (1:5.1.0~rc2-2) UNRELEASED; urgency=medium
  
+   * debian/patches/gcc-6.diff: backport gcc 6 compile/test fixes from master
+     (closes: #811686)
+   * debian/patches/GCC-6-PR69273-workaround.diff: add gcc 6 ICE workaround
+     from Stephan Bergmann
+ 
    * debian/rules:
      - -officebean is a arch-dep package, move pom generation and mh_*
        calls for it to install-arch...

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