[libreoffice] 01/01: Merge remote-tracking branch 'origin/master' into debian-experimental-4.2

[Rene Engelhard <rene@moszumanska.debian.org>]

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 7d4be4fb2a4f00b2f76fe2c3d1c29b37d16babbc
Merge: c7aa272 deccf82
Author: Rene Engelhard <rene@debian.org>
Date:   Sat May 17 18:58:11 2014 +0200

    Merge remote-tracking branch 'origin/master' into debian-experimental-4.2

 changelog       |  2 +-
 control         | 66 ++++++++++++++++++++++++++++-----------------------------
 control.help.in |  1 +
 3 files changed, 35 insertions(+), 34 deletions(-)


-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git