[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 d0bf09975f268c8b625dda93c0afd59126001d1a
Merge: 3f4cf90 e972a5f
Author: Rene Engelhard <rene@debian.org>
Date:   Thu May 29 22:54:16 2014 +0200

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

 changelog | 20 ++++++++++--------
 control   |  2 +-
 rules     | 69 ++++++++++++++++++++++++++++++++-------------------------------
 3 files changed, 48 insertions(+), 43 deletions(-)


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