[libreoffice] 02/03: 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 a79b2c32ccef6f2471a3a1f076d8d9bc812d91e8
Merge: 1bf994f dfbe7bb
Author: Rene Engelhard <rene@debian.org>
Date:   Fri Dec 4 10:20:46 2015 +0100

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

 changelog | 10 +++++-----
 rules     |  6 +++++-
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --cc changelog
index af4856d,b68a70d..e9febca
--- a/changelog
+++ b/changelog
@@@ -1,10 -1,4 +1,10 @@@
 +libreoffice (1:5.2.0~alpha1~git20151201-1) UNRELEASED; urgency=medium
 +
 +  * New upstream snapshot
 +
 + -- Rene Engelhard <rene@rene-engelhard.de>  Thu, 26 Nov 2015 10:37:57 +0100
 +
- libreoffice (1:5.1.0~beta1-1) experimental; urgency=medium
+ libreoffice (1:5.1.0~beta2-1) experimental; urgency=medium
  
    * New upstream beta release
      - fixes crash when selecting the border style in some window managers

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