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

[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.4
in repository libreoffice.

commit 7a7cd7f576395b669bc38dfdb53fc7787ad4e537
Merge: 51cb3f2 9cd15ac
Author: Rene Engelhard <rene@debian.org>
Date:   Sun Sep 14 22:57:13 2014 +0200

    Merge remote-tracking branch 'origin/master' into debian-experimental-4.4
    
    Conflicts:
    	control
    	rules

 changelog | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)


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