This is an automated email from the git hooks/post-receive script. rene pushed a commit to branch debian-experimental-5.2 in repository libreoffice.
commit cfe551e706423dfc1d177142625296ef8bc0099a Merge: db03aae 72f18c4 Author: Rene Engelhard <[email protected]> Date: Wed Mar 16 22:45:04 2016 +0100 Merge remote-tracking branch 'origin/master' into debian-experimental-5.2 Conflicts: changelog rules changelog | 15 +++++++-------- lo-cpp-ref.in | 2 +- lo-java-ref.in | 2 +- rules | 6 +++--- watch | 3 +-- 5 files changed, 13 insertions(+), 15 deletions(-) diff --cc changelog index 21b2b19,311cf90..e519789 --- a/changelog +++ b/changelog @@@ -1,13 -1,6 +1,13 @@@ +libreoffice (1:5.2.0~alpha1~git20160314-1) UNRELEASED; urgency=medium + + * New upstream snapshot + - fixes SVG t(ext s)pan import (closes: #665094) + - -- Rene Engelhard <[email protected]> Thu, 26 Nov 2015 10:37:57 +0100 ++ -- Rene Engelhard <[email protected]> Thu, 26 Nov 2015 10:37:57 +0100 + - libreoffice (1:5.1.2~rc1~git20160314-1) UNRELEASED; urgency=medium + libreoffice (1:5.1.2~rc1-1) unstable; urgency=medium - * New upstream snapshot + * New upstream release candidate - -sdbc-postgresql: use proper schema name for type names (closes: #808125) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
