[med-svn] [python-pbh5tools] 02/02: Merge branch 'master' of git+ssh://git.debian.org/git/debian-med/python-pbh5tools

[Afif Elghraoui]

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

afif-guest pushed a commit to branch master
in repository python-pbh5tools.

commit 212107c9625fdcc5fd1e303cf318aca19e9fce30
Merge: e3dfeb4 a0679fb
Author: Afif Elghraoui <afif at ghraoui.name>
Date:   Tue Jul 28 19:33:26 2015 -0700

    Merge branch 'master' of git+ssh://git.debian.org/git/debian-med/python-pbh5tools
    
    Conflicts:
    	debian/changelog
    I had forgotten to push the changelog after filing the ITP and recording the
    bug.


-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/python-pbh5tools.git