[libreoffice-online] 02/02: Merge branch 'master' into experimental

[Rene Engelhard]

This is an automated email from the git hooks/post-receive script.

rene pushed a commit to branch experimental
in repository libreoffice-online.

commit 6f5068a0f12e969b10328a7156f025ef987b8af0
Merge: a84dc78 c8d5e13
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Wed Nov 29 01:29:26 2017 +0100

    Merge branch 'master' into experimental

 debian/rules | 2 ++
 1 file changed, 2 insertions(+)

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