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

[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-pysam.

commit dffe5f12cbccba47bd4d106eecd5418ea7fc3dd9
Merge: 5a6adf6 81ff5d2
Author: Afif Elghraoui <afif at ghraoui.name>
Date:   Thu Jun 25 00:19:03 2015 -0700

    Merge branch 'master' of git+ssh://git.debian.org/git/debian-med/python-pysam
    
    Conflicts:
    	debian/changelog


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