[libreoffice] 03/03: Merge remote-tracking branch 'origin/master' into debian-experimental-5.0

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

commit fd994cca6236577f9185a7fc16d5344513f0072c
Merge: 29cf1f8 380ffe6
Author: Rene Engelhard <rene@debian.org>
Date:   Wed Aug 26 14:48:47 2015 +0200

    Merge remote-tracking branch 'origin/master' into debian-experimental-5.0
    
    Conflicts:
    	changelog

 changelog | 11 +++++++++--
 rules     |  4 ++--
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --cc changelog
index 0a44b3f,c3427f3..013976e
--- a/changelog
+++ b/changelog
@@@ -1,10 -1,11 +1,17 @@@
 +libreoffice (1:5.0.2~rc1~git20150826-1) UNRELEASED; urgency=medium
 +
 +  * New upstream snapshot
 +
 + -- Rene Engelhard <rene@debian.org>  Wed, 12 Aug 2015 15:23:58 +0200
 +
- libreoffice (1:5.0.1~rc2-1) UNRELEASED; urgency=medium
+ libreoffice (1:5.0.1~rc2-2) UNRELEASED; urgency=medium
+ 
+   * debian/rules:
+     - two more s/src/tarballs/ I forgot
+ 
+  -- Rene Engelhard <rene@debian.org>  Mon, 24 Aug 2015 18:29:14 +0200
+ 
+ libreoffice (1:5.0.1~rc2-1) unstable; urgency=medium
  
    * New upstream release candidate
  

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