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

[Rene Engelhard]

This is an automated email from the git hooks/post-receive script.

rene pushed a commit to branch debian-experimental-5.5
in repository libreoffice.

commit 6070230b5b70a841bec271f58aa53ebb16039d05
Merge: ff8585a a9bad66
Author: Rene Engelhard <rene at debian.org>
Date:   Mon May 22 20:17:27 2017 +0200

    Merge remote-tracking branch 'origin/debian-experimental-5.4' into debian-experimental-5.5

 changelog                      |  14 ++
 control                        | 320 +++++++++++++++++++++--------------------
 control.evolution.in           |   1 -
 control.firebird.in            |   1 -
 control.gtk2.in                |   1 -
 control.gtk3.in                |   1 -
 control.help.in                |   1 -
 control.in                     |  28 +---
 control.kde.in                 |   1 -
 control.lang.in                |   1 -
 control.mediawiki.in           |   1 -
 control.ogltrans.in            |   1 -
 control.postgresql.in          |   1 -
 control.reportdesign.in        |   2 -
 control.sdk.in                 |   1 -
 control.subsequentcheckbase.in |   1 -
 patches/check-for-dejavu.diff  |  60 ++++++++
 patches/series                 |   1 +
 rules                          |  21 ++-
 tests/control                  |   2 +-
 20 files changed, 250 insertions(+), 210 deletions(-)


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