[libreoffice] 02/03: 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 905cbdcf7aa9030246843c04e2e75c691620fedd
Merge: e846862 a57d238
Author: Rene Engelhard <rene@debian.org>
Date:   Thu Jul 10 00:02:35 2014 +0200

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

 changelog | 1 +
 control   | 2 ++
 rules     | 6 ++----
 3 files changed, 5 insertions(+), 4 deletions(-)


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