[libreoffice] 01/02: Merge remote-tracking branch 'origin/master' into debian-experimental-5.1
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 77a5a9eca59296f7d71644c94650b884b6382dfd
Merge: ddcea3b e4f1402
Author: Rene Engelhard <rene@debian.org>
Date: Tue Oct 6 20:46:18 2015 +0200
Merge remote-tracking branch 'origin/master' into debian-experimental-5.1
control | 2 +-
control.in | 2 +-
rules | 12 ++++++++----
3 files changed, 10 insertions(+), 6 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: