[libreoffice] 02/02: Merge remote-tracking branch 'origin/master' into debian-experimental-4.2
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-4.2
in repository libreoffice.
commit 3c3004b8c1d9e2b92f75def6346b8bc93eb4ac9f
Merge: ee688a0 dc323f4
Author: Rene Engelhard <rene@debian.org>
Date: Fri Apr 25 08:00:41 2014 +0200
Merge remote-tracking branch 'origin/master' into debian-experimental-4.2
Conflicts:
changelog
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: