[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 8f80839f35520ad57bbe525b08aeda72f519260b
Merge: df4a44e 5fc8737
Author: Rene Engelhard <rene@debian.org>
Date:   Fri Oct 2 11:43:19 2015 +0200

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

 changelog  | 10 +++++++++-
 control    | 14 +++++++-------
 control.in | 12 ++++++------
 rules      | 17 ++++++++++-------
 4 files changed, 32 insertions(+), 21 deletions(-)


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