[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 73b79efc0f298f6ab0569fa8daa34293ddb9033f
Merge: 2a2915e eebd634
Author: Rene Engelhard <rene@debian.org>
Date:   Mon Mar 14 18:49:14 2016 +0100

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

 changelog                        |  4 +--
 patches/disable-flaky-tests.diff | 55 ++++++++++++++++++++++++++++++++--------
 2 files changed, 46 insertions(+), 13 deletions(-)

diff --cc changelog
index 4628c67,26d9776..7463255
--- a/changelog
+++ b/changelog
@@@ -1,11 -1,4 +1,11 @@@
- libreoffice (1:5.2.0~alpha1~git20160308-1) UNRELEASED; urgency=medium
++libreoffice (1:5.2.0~alpha1~git20160314-1) UNRELEASED; urgency=medium
 +
 +  * New upstream snapshot
 +    - fixes SVG t(ext s)pan import (closes: #665094)
 +
 + -- Rene Engelhard <rene@rene-engelhard.de>  Thu, 26 Nov 2015 10:37:57 +0100
 +
- libreoffice (1:5.1.2~rc1~git20160307-1) UNRELEASED; urgency=medium
+ libreoffice (1:5.1.2~rc1~git20160314-1) UNRELEASED; urgency=medium
  
    * New upstream snapshot
      - -sdbc-postgresql: use proper schema name for type names

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