[libreoffice] 02/02: 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 9a79cc200e9428b72f0ff20c8b4a850e4359fdc0
Merge: 81a5a7d 261ea40
Author: Rene Engelhard <rene@debian.org>
Date:   Tue Jun 14 21:13:03 2016 +0200

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

 changelog | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --cc changelog
index cd4f5d1,5c5732c..f078740
--- a/changelog
+++ b/changelog
@@@ -1,11 -1,10 +1,17 @@@
 +libreoffice (1:5.1.5~rc1~git20160613-1) UNRELEASED; urgency=medium
 +
 +  * New upstream snapshot
-     - scales gtk3 smooth scaling events (closes: #826654)
 +    - only initalizes the OpenGL context if we need it (closes: #819153)
 +
 + -- Rene Engelhard <rene@debian.org>  Sat, 11 Jun 2016 19:24:08 +0200
 +
+ libreoffice (1:5.1.4~rc2-1) unstable; urgency=medium
+ 
+   * new upstream release candidate
+     - scales gtk3 smooth scaling events... (closes: #826654)
+ 
+  -- Rene Engelhard <rene@debian.org>  Tue, 14 Jun 2016 19:16:44 +0200
+ 
  libreoffice (1:5.1.4~rc1-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