[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 125aa1c08e6aca63ead6326bd826277f80be9c56
Merge: da95373 96e1996
Author: Rene Engelhard <rene@debian.org>
Date:   Mon Apr 11 23:20:29 2016 +0200

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

 changelog                                          | 11 +++++-
 libreoffice-gtk3.maintscript                       |  2 +-
 ...-t-install-qstart.desktop-if-it-s-disabled.diff | 40 ++++++++++++++++++++++
 3 files changed, 51 insertions(+), 2 deletions(-)

diff --cc changelog
index 576227e,d91bc92..a95bcfa
--- a/changelog
+++ b/changelog
@@@ -1,9 -1,12 +1,18 @@@
- libreoffice (1:5.1.3~rc1~git20160404-1) UNRELEASED; urgency=medium
++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-3) unstable; urgency=medium
+ 
+   * debian/patches/don-t-install-qstart.desktop-if-it-s-disabled.diff:
+     as name says (closes: #820657)
+   * debian/libreoffice-gtk3.maintscript: bump version to also fix
+     stretch updates
+ 
+  -- Rene Engelhard <rene@debian.org>  Mon, 11 Apr 2016 18:54:00 +0200
+ 
  libreoffice (1:5.1.2-2) unstable; urgency=medium
  
    * debian/rules:

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