[libreoffice] 02/05: Merge remote-tracking branch 'origin/debian-experimental-4.4' into debian-experimental-4.5

[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-4.5
in repository libreoffice.

commit 6a8724ce025b2727c9d27cc31f1058358b527163
Merge: 782b9ec c45c8ad
Author: Rene Engelhard <rene@debian.org>
Date:   Sun Mar 29 12:18:31 2015 +0200

    Merge remote-tracking branch 'origin/debian-experimental-4.4' into debian-experimental-4.5
    
    Conflicts:
    	changelog

 changelog | 6 ++++++
 1 file changed, 6 insertions(+)

diff --cc changelog
index 1ec3b33,afbded0..23b19da
--- a/changelog
+++ b/changelog
@@@ -1,12 -1,9 +1,18 @@@
 +libreoffice (1:4.5.0~alpha1~git20150327-1) UNRELEASED; urgency=medium
 +
 +  * new upstream snapshot
 +
 +  * debian/rules:
 +    - adapt for ure folded into /usr/lib/libreoffice/program directly
 +
 + -- Rene Engelhard <rene@debian.org>  Tue, 02 Dec 2014 21:56:42 +0100
 +
+ libreoffice (1:4.4.2~rc2-1) experimental; urgency=medium
+ 
+   * New upstream release candidate
+ 
+  -- Rene Engelhard <rene@debian.org>  Fri, 27 Mar 2015 07:07:59 +0100
+ 
  libreoffice (1:4.4.2~rc1-1) experimental; urgency=medium
  
    * New upstream release candidate

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