[libreoffice] 01/01: 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 7497bfa9bd19c327797346a907626ea8a15ea612
Merge: 6038057 1d9841f
Author: Rene Engelhard <rene@debian.org>
Date:   Wed Sep 23 12:31:06 2015 +0200

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

 changelog | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --cc changelog
index 0c4a34a,772bb1a..821a097
--- a/changelog
+++ b/changelog
@@@ -1,12 -1,6 +1,12 @@@
 +libreoffice (1:5.0.3~rc1~git20150917-1) UNRELEASED; urgency=medium
 +
 +  * New upstream snapshot
 +
 + -- Rene Engelhard <rene@debian.org>  Thu, 17 Sep 2015 18:20:07 +0200
 +
- libreoffice (1:5.0.2~rc2-1) UNRELEASED; urgency=medium
+ libreoffice (1:5.0.2-1) unstable; urgency=medium
  
-   * New upstream release candidate
+   * New upstream release
      - fixes crash on gestureLongPress (closes: #798591)
  
    * debian/*.menu: remove, as per TC resolution

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