[libreoffice] 01/05: Merge remote-tracking branch 'origin/debian-experimental-5.2' into debian-experimental-5.3
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-5.3
in repository libreoffice.
commit e926c2f7f4e8c5a9dd30018c52837601cbe18a0f
Merge: aa067e5 df98c07
Author: Rene Engelhard <rene@debian.org>
Date: Wed Aug 17 14:30:53 2016 +0200
Merge remote-tracking branch 'origin/debian-experimental-5.2' into debian-experimental-5.3
Conflicts:
control
control.transitionals.in
changelog | 14 ++++++++------
control | 2 +-
control.mysql.in | 2 +-
rules | 2 +-
4 files changed, 11 insertions(+), 9 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: