[med-svn] samtools 02/02: Merge branch 'pristine-tar' of github.com:Debian/samtools into pristine-tar

[Charles Plessy]

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

plessy pushed a commit to branch pristine-tar
in repository samtools.

commit 3420dc15905416f6086fc7a364c567d34d5f785d
Merge: 5e506a2 88d3383
Author: Charles Plessy <plessy at debian.org>
Date:   Thu Sep 25 08:29:55 2014 +0900

    Merge branch 'pristine-tar' of github.com:Debian/samtools into pristine-tar
    
    Conflicts:
    	samtools_1.0.orig.tar.gz.delta


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