[libreoffice] 02/02: 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 fa54f688ee7590cf4cab870906ae9e7b1c9ec721
Merge: bc25e3d a07e1b4
Author: Rene Engelhard <rene@debian.org>
Date:   Mon Oct 5 12:47:40 2015 +0200

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

 changelog                      | 5 +++++
 control                        | 4 ++--
 control.in                     | 3 ++-
 control.subsequentcheckbase.in | 2 +-
 rules                          | 4 ----
 5 files changed, 10 insertions(+), 8 deletions(-)


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