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

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

commit 4ca5e6a38c4e5dda3ab4f59bfa9a78aba6ad539c
Merge: 5316753 5fc8737
Author: Rene Engelhard <rene@debian.org>
Date:   Fri Oct 2 11:44:13 2015 +0200

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

 changelog  | 10 +++++++++-
 control    | 12 ++++++------
 control.in | 12 ++++++------
 rules      | 17 ++++++++++-------
 4 files changed, 31 insertions(+), 20 deletions(-)


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