[libreoffice] 03/03: Merge remote-tracking branch 'origin/master' into debian-experimental-5.0
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 57be0a1261fcd9f5224bad28cf91e059ce1b2da1
Merge: 9716b49 9b7eb42
Author: Rene Engelhard <rene@debian.org>
Date: Fri Jun 19 17:08:12 2015 +0200
Merge remote-tracking branch 'origin/master' into debian-experimental-5.0
Conflicts:
changelog
python-uno.NEWS | 27 ---------------------------
python-uno.lintian-overrides | 2 --
2 files changed, 29 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: