[liborcus] 05/05: Merge branch 'experimental' of ssh://git.debian.org/git/pkg-openoffice/liborcus 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 liborcus.

commit 10e11532b990a1d5cbf10da1fff3535af16f306e
Merge: ce0975f 752d34c
Author: Rene Engelhard <rene at debian.org>
Date:   Tue Sep 13 05:38:25 2016 +0200

    Merge branch 'experimental' of ssh://git.debian.org/git/pkg-openoffice/liborcus into experimental
    
    Conflicts:
    	debian/changelog


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