[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 620a4e02157af08402b86fae6e7743e916e0306d
Merge: 692121e 6484bee
Author: Rene Engelhard <rene@debian.org>
Date:   Mon Mar 7 20:35:00 2016 +0100

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

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

diff --cc changelog
index d1779b3,f2b69f0..091aa57
--- a/changelog
+++ b/changelog
@@@ -1,7 -1,6 +1,13 @@@
 +libreoffice (1:5.2.0~alpha1~git20160303-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
+ 
+   * New upstream snapshot
      - -sdbc-postgresql: use proper schema name for type names
        (closes: #808125)
  

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