[libreoffice] 01/01: 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 56671e0c497cef9012482c3c1b7b9ab424e13d0d
Merge: f542693 07eb332
Author: Rene Engelhard <rene@debian.org>
Date:   Thu Dec 18 00:06:36 2014 +0100

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

 changelog | 6 ++++++
 control   | 4 ++--
 rules     | 4 ++--
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --cc changelog
index 65fa4b4,f645ce7..e37a0e6
--- a/changelog
+++ b/changelog
@@@ -1,12 -1,9 +1,18 @@@
 +libreoffice (1:4.5.0~alpha1~git20141206) 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.0~rc1-1) experimental; urgency=medium
+ 
+   * New upstream release candidate
+ 
+  -- Rene Engelhard <rene@debian.org>  Wed, 17 Dec 2014 23:38:37 +0100
+ 
  libreoffice (1:4.4.0~beta2-1) experimental; urgency=medium
  
    * New upstream beta release

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