[Pkg-ocaml-maint-commits] [dose3] 03/03: Merge branch 'jessie-backports/master' of git+ssh://git.debian.org/git/pkg-ocaml-maint/packages/dose3 into jessie-backports/master

[Ralf Treinen]

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

treinen pushed a commit to branch jessie-backports/master
in repository dose3.

commit 2cf6d55979c4397d2ccfcc5992708aa606e0216b
Merge: 0414130 e6b2a9b
Author: Ralf Treinen <treinen at pps.univ-paris-diderot.fr>
Date:   Wed Jun 29 17:32:33 2016 +0200

    Merge branch 'jessie-backports/master' of git+ssh://git.debian.org/git/pkg-ocaml-maint/packages/dose3 into jessie-backports/master
    
    Conflicts:
    	debian/changelog


-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/dose3.git