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

[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.1
in repository libreoffice.

commit 491318421362553030515ea867dd4a07fe5e78f6
Merge: 125aa1c 2963a7d
Author: Rene Engelhard <rene@debian.org>
Date:   Sun Apr 17 12:01:08 2016 +0200

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

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

diff --cc changelog
index a95bcfa,22d8b7b..c1a4d9d
--- a/changelog
+++ b/changelog
@@@ -1,9 -1,10 +1,16 @@@
 +libreoffice (1:5.1.3~rc1~git20160411-1) UNRELEASED; urgency=medium
 +
 +  * New upstream snapshot
 +
 + -- Rene Engelhard <rene@debian.org>  Sat, 02 Apr 2016 12:48:35 +0200
 +
+ libreoffice (1:5.1.2-4) unstable; urgency=medium
+ 
+   * debian/patches/fix-list-and-comboboxes-with-gtk3-3-20-2.diff:
+     backport from libreoffice-5-1 branch, as name says 
+ 
+  -- Rene Engelhard <rene@debian.org>  Sat, 16 Apr 2016 17:55:25 +0200
+ 
  libreoffice (1:5.1.2-3) unstable; urgency=medium
  
    * debian/patches/don-t-install-qstart.desktop-if-it-s-disabled.diff:

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