[libreoffice-online] 05/05: 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 a84dc78e71960b700fe59a68bc0d24a6523a9031
Merge: 84c9918 945573b
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Wed Nov 29 01:25:45 2017 +0100

    Merge branch 'master' into experimental

 debian/loolwsd.links | 1 +
 1 file changed, 1 insertion(+)

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